From 11cb7ed4fa3e78e8af1c98d0f18d0a4a939fa80b Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Wed, 11 Feb 2026 15:58:20 +0100
Subject: [PATCH 01/90] add cloud discovery metadata

---
 front/src/config.js                           |   4 +-
 front/src/config/i18n/de.json                 |  22 ++-
 front/src/config/i18n/en.json                 |  22 ++-
 front/src/config/i18n/fr.json                 |  20 +-
 .../integration/all/tuya/TuyaDeviceBox.jsx    |  52 +++++-
 .../all/tuya/discover-page/DiscoverTab.jsx    |  64 ++++++-
 .../all/tuya/setup-page/SetupTab.jsx          | 173 ++++++++++++++++--
 .../tuya/lib/device/tuya.convertDevice.js     |  25 ++-
 server/services/tuya/lib/index.js             |   1 +
 server/services/tuya/lib/tuya.connect.js      |  11 +-
 .../tuya/lib/tuya.getConfiguration.js         |   2 +
 .../tuya/lib/tuya.loadDeviceDetails.js        |  24 ++-
 server/services/tuya/lib/tuya.loadDevices.js  |  22 +--
 .../tuya/lib/tuya.saveConfiguration.js        |   3 +-
 .../services/tuya/lib/utils/tuya.constants.js |   9 +
 .../services/tuya/lib/tuya.connect.test.js    |  10 +-
 .../tuya/lib/tuya.discoverDevices.test.js     |  37 +++-
 .../tuya/lib/tuya.getConfiguration.test.js    |   8 +-
 .../tuya/lib/tuya.loadDeviceDetails.test.js   |  17 +-
 .../tuya/lib/tuya.loadDevices.test.js         |  14 +-
 .../tuya/lib/tuya.saveConfiguration.test.js   |   4 +-
 server/utils/constants.js                     |   1 +
 22 files changed, 459 insertions(+), 86 deletions(-)

diff --git a/front/src/config.js b/front/src/config.js
index 2e8aa5b2af..f29374d2c3 100644
--- a/front/src/config.js
+++ b/front/src/config.js
@@ -1,7 +1,7 @@
 const local = {
   gladysGatewayApiUrl: process.env.GLADYS_GATEWAY_API_URL || 'https://api.gladysgateway.com',
-  localApiUrl: process.env.LOCAL_API_URL || 'http://localhost:1443',
-  webSocketUrl: process.env.WEBSOCKET_URL || 'ws://localhost:1443',
+  localApiUrl: process.env.LOCAL_API_URL || 'http://10.1.0.62:1443',
+  webSocketUrl: process.env.WEBSOCKET_URL || 'ws://10.1.0.62:1443',
   gatewayMode: process.env.GATEWAY_MODE === 'true',
   demoMode: process.env.DEMO_MODE === 'true',
   demoRequestTime: process.env.DEMO_REQUEST_TIME || 0,
diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index c2d955661b..1af20b6c5b 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1175,14 +1175,18 @@
         "updates": "Nach Updates suchen",
         "editButton": "Bearbeiten",
         "noDeviceFound": "Du hast noch keine Tuya-Geräte hinzugefügt.",
-        "featuresLabel": "Funktionen"
+        "featuresLabel": "Funktionen",
+        "idLabel": "Geräte-ID",
+        "localKeyLabel": "Lokaler Schlüssel"
       },
       "discover": {
         "title": "In deinem Tuya-Cloud-Account erkannte Geräte",
         "description": "Tuya-Geräte werden automatisch erkannt. Deine Tuya-Geräte müssen zuerst zu deinem Tuya-Cloud-Account hinzugefügt werden.",
         "error": "Fehler beim Entdecken von Tuya-Geräten. Bitte überprüfe deine Login-Daten auf der Einrichtungsseite.",
         "noDeviceFound": "Kein Tuya-Gerät entdeckt.",
-        "scan": "Scannen"
+        "scan": "Scannen",
+        "addSelected": "Auswahl hinzufügen",
+        "addSelectedError": "Fehler beim Hinzufügen der ausgewählten Geräte."
       },
       "setup": {
         "title": "Tuya-Konfiguration",
@@ -1201,12 +1205,14 @@
           "india": "Indien"
         },
         "endpoint": "Endpunkt",
-        "accessKey": "Access Key",
-        "accessKeyPlaceholder": "Tuya Zugangsschlüssel eingeben",
-        "secretKey": "Secret Key",
-        "secretKeyPlaceholder": "Tuya Geheimschlüssel eingeben",
-        "appAccountId": "App Account UID",
-        "appAccountIdPlaceholder": "Tuya App UID eingeben",
+        "accessKey": "Client ID",
+        "accessKeyPlaceholder": "Tuya Client ID eingeben",
+        "secretKey": "Client Secret",
+        "secretKeyPlaceholder": "Tuya Client Secret eingeben",
+        "appAccountId": "App Account User ID",
+        "appAccountIdPlaceholder": "Tuya App User ID eingeben",
+        "appUsername": "App Username",
+        "appUsernamePlaceholder": "Tuya App Username eingeben",
         "saveLabel": "Konfiguration sichern",
         "error": "Beim Sichern der Konfiguration ist ein Fehler aufgetreten.",
         "connecting": "Konfiguration gesichert. Die Verbindung mit deinem Tuya-Cloud-Account wird jetzt hergestellt …",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index ac15af5b8c..8972039793 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1070,14 +1070,18 @@
         "updates": "Check updates",
         "editButton": "Edit",
         "noDeviceFound": "No Tuya device found.",
-        "featuresLabel": "Features"
+        "featuresLabel": "Features",
+        "idLabel": "Device ID",
+        "localKeyLabel": "Local Key"
       },
       "discover": {
         "title": "Devices detected on your Tuya cloud account",
         "description": "Tuya devices are automatically discovered. Your Tuya devices need to be added to your Tuya cloud account before.",
         "error": "Error discovering Tuya devices. Please verify your credentials on Setup.",
         "noDeviceFound": "No Tuya device discovered.",
-        "scan": "Scan"
+        "scan": "Scan",
+        "addSelected": "Add selected",
+        "addSelectedError": "Error adding selected devices."
       },
       "setup": {
         "title": "Tuya configuration",
@@ -1096,12 +1100,14 @@
           "india": "India"
         },
         "endpoint": "Endpoint",
-        "accessKey": "Access Key",
-        "accessKeyPlaceholder": "Enter Tuya access key",
-        "secretKey": "Secret Key",
-        "secretKeyPlaceholder": "Enter Tuya secret key",
-        "appAccountId": "App account UID",
-        "appAccountIdPlaceholder": "Enter Tuya application UID",
+        "accessKey": "Client ID",
+        "accessKeyPlaceholder": "Enter Tuya Client ID",
+        "secretKey": "Client Secret",
+        "secretKeyPlaceholder": "Enter Tuya Client Secret",
+        "appAccountId": "App account User ID",
+        "appAccountIdPlaceholder": "Enter Tuya app User ID",
+        "appUsername": "App Username",
+        "appUsernamePlaceholder": "Enter Tuya app Username",
         "saveLabel": "Save configuration",
         "error": "An error occurred while saving configuration.",
         "connecting": "Configuration saved. Now connecting to your Tuya cloud account...",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index 9423b8534a..c9cb42e5a3 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1305,14 +1305,18 @@
         "updates": "Vérifier les mises à jour",
         "editButton": "Éditer",
         "noDeviceFound": "Aucun appareil Tuya trouvé.",
-        "featuresLabel": "Fonctionnalités"
+        "featuresLabel": "Fonctionnalités",
+        "idLabel": "Identifiant de l'appareil",
+        "localKeyLabel": "Clé locale"
       },
       "discover": {
         "title": "Appareils détectés sur votre compte cloud Tuya",
         "description": "Les appareils Tuya sont automatiquement découverts. Vos appareils Tuya doivent être ajoutés à votre compte cloud Tuya avant.",
         "error": "Erreur de découverte des appareils Tuya. Veuillez vérifier vos informations d'identification lors de l'installation.",
         "noDeviceFound": "Aucun appareil Tuya n'a été découvert.",
-        "scan": "Scanner"
+        "scan": "Scanner",
+        "addSelected": "Ajouter la sélection",
+        "addSelectedError": "Erreur lors de l'ajout des appareils sélectionnés."
       },
       "setup": {
         "title": "Configuration Tuya",
@@ -1331,12 +1335,14 @@
           "india": "India"
         },
         "endpoint": "Endpoint",
-        "accessKey": "Access Key",
-        "accessKeyPlaceholder": "Entrez l'Access Key de Tuya",
-        "secretKey": "Secret Key",
-        "secretKeyPlaceholder": "Entrez la Secret Key de Tuya",
-        "appAccountId": "App account UID",
+        "accessKey": "Client ID",
+        "accessKeyPlaceholder": "Entrez le 'Client ID' de Tuya",
+        "secretKey": "Client Secret",
+        "secretKeyPlaceholder": "Entrez le 'Client Secret' de Tuya",
+        "appAccountId": "App account User ID",
         "appAccountIdPlaceholder": "Entrez l'UID de l'app de Tuya",
+        "appUsername": "App Username",
+        "appUsernamePlaceholder": "Entrez le Username de l'app de Tuya",
         "saveLabel": "Enregistrer la configuration",
         "error": "Une erreur s'est produite lors de la sauvegarde de la configuration.",
         "connecting": "Configuration sauvegardée. Connexion à votre compte cloud Tuya...",
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 7e202253a0..39723f0124 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -99,23 +99,45 @@ class TuyaDeviceBox extends Component {
       saveButton,
       updateButton,
       alreadyCreatedButton,
-      housesWithRooms
+      housesWithRooms,
+      selectable,
+      selected,
+      onToggleSelected
     },
     { device, loading, errorMessage, tooMuchStatesError, statesNumber }
   ) {
     const validModel = device.features && device.features.length > 0;
     const online = device.online;
+    const params = (device.params || []).reduce((acc, param) => {
+      acc[param.name] = param.value;
+      return acc;
+    }, {});
+    const deviceId = params.DEVICE_ID || (device.external_id ? device.external_id.split(':')[1] : '');
+    const localKey = params.LOCAL_KEY || device.local_key || '';
 
     return (
       <div class="col-md-6">
         <div class="card">
-          <div class="card-header">
+          <div class="card-header d-flex align-items-center justify-content-between">
             <Localizer>
               <div title={<Text id={`integration.tuya.status.${online ? 'online' : 'offline'}`} />}>
                 <i class={`fe fe-radio text-${online ? 'success' : 'danger'}`} />
                 &nbsp;{device.name}
               </div>
             </Localizer>
+            {selectable && (
+              <div class="custom-control custom-checkbox">
+                <input
+                  id={`select_${deviceIndex}`}
+                  type="checkbox"
+                  class="custom-control-input"
+                  checked={selected === true}
+                  disabled={!validModel}
+                  onChange={() => onToggleSelected && onToggleSelected(device.external_id)}
+                />
+                <label class="custom-control-label" for={`select_${deviceIndex}`} />
+              </div>
+            )}
           </div>
           <div
             class={cx('dimmer', {
@@ -165,6 +187,32 @@ class TuyaDeviceBox extends Component {
                   />
                 </div>
 
+                <div class="form-group">
+                  <label class="form-label" for={`device_id_${deviceIndex}`}>
+                    <Text id="integration.tuya.device.idLabel" />
+                  </label>
+                  <input
+                    id={`device_id_${deviceIndex}`}
+                    type="text"
+                    value={deviceId}
+                    class="form-control"
+                    disabled="true"
+                  />
+                </div>
+
+                <div class="form-group">
+                  <label class="form-label" for={`local_key_${deviceIndex}`}>
+                    <Text id="integration.tuya.device.localKeyLabel" />
+                  </label>
+                  <input
+                    id={`local_key_${deviceIndex}`}
+                    type="text"
+                    value={localKey}
+                    class="form-control"
+                    disabled="true"
+                  />
+                </div>
+
                 <div class="form-group">
                   <label class="form-label" for={`room_${deviceIndex}`}>
                     <Text id="integration.tuya.roomLabel" />
diff --git a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
index 61cab08e3a..762c702c60 100644
--- a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
+++ b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
@@ -37,7 +37,8 @@ class DiscoverTab extends Component {
 
   getDiscoveredDevices = async () => {
     this.setState({
-      loading: true
+      loading: true,
+      selectedDeviceIds: []
     });
     try {
       const discoveredDevices = await this.props.httpClient.get('/api/v1/service/tuya/discover');
@@ -54,7 +55,49 @@ class DiscoverTab extends Component {
     }
   };
 
-  render(props, { loading, errorLoading, discoveredDevices, housesWithRooms }) {
+  toggleSelectedDevice = externalId => {
+    const selectedDeviceIds = new Set(this.state.selectedDeviceIds || []);
+    if (selectedDeviceIds.has(externalId)) {
+      selectedDeviceIds.delete(externalId);
+    } else {
+      selectedDeviceIds.add(externalId);
+    }
+    this.setState({
+      selectedDeviceIds: Array.from(selectedDeviceIds)
+    });
+  };
+
+  addSelectedDevices = async () => {
+    const selectedDeviceIds = this.state.selectedDeviceIds || [];
+    const discoveredDevices = this.state.discoveredDevices || [];
+    const devicesToAdd = discoveredDevices.filter(device => selectedDeviceIds.includes(device.external_id));
+
+    if (devicesToAdd.length === 0) {
+      return;
+    }
+
+    this.setState({
+      addingSelected: true,
+      errorAddingSelected: false
+    });
+
+    try {
+      await Promise.all(devicesToAdd.map(device => this.props.httpClient.post('/api/v1/device', device)));
+      await this.getDiscoveredDevices();
+      this.setState({
+        addingSelected: false,
+        selectedDeviceIds: []
+      });
+    } catch (e) {
+      this.setState({
+        addingSelected: false,
+        errorAddingSelected: true
+      });
+    }
+  };
+
+  render(props, { loading, errorLoading, discoveredDevices, housesWithRooms, selectedDeviceIds, addingSelected, errorAddingSelected }) {
+    const selectedCount = (selectedDeviceIds || []).length;
     return (
       <div class="card">
         <div class="card-header">
@@ -65,15 +108,27 @@ class DiscoverTab extends Component {
             <button onClick={this.getDiscoveredDevices} class="btn btn-outline-primary ml-2" disabled={loading}>
               <Text id="integration.tuya.discover.scan" /> <i class="fe fe-radio" />
             </button>
+            <button
+              onClick={this.addSelectedDevices}
+              class="btn btn-outline-success ml-2"
+              disabled={loading || addingSelected || selectedCount === 0}
+            >
+              <Text id="integration.tuya.discover.addSelected" />
+            </button>
           </div>
         </div>
         <div class="card-body">
           <div class="alert alert-secondary">
             <Text id="integration.tuya.discover.description" />
           </div>
+          {errorAddingSelected && (
+            <div class="alert alert-danger">
+              <Text id="integration.tuya.discover.addSelectedError" />
+            </div>
+          )}
           <div
             class={cx('dimmer', {
-              active: loading
+              active: loading || addingSelected
             })}
           >
             <div class="loader" />
@@ -94,6 +149,9 @@ class DiscoverTab extends Component {
                       alreadyCreatedButton={device.created_at && !device.updatable}
                       updateButton={device.updatable}
                       saveButton={!device.created_at}
+                      selectable={!device.created_at || device.updatable}
+                      selected={selectedDeviceIds && selectedDeviceIds.includes(device.external_id)}
+                      onToggleSelected={this.toggleSelectedDevice}
                       device={device}
                       deviceIndex={index}
                       housesWithRooms={housesWithRooms}
diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index b83ae99277..8814b30827 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -4,10 +4,29 @@ import cx from 'classnames';
 import { RequestStatus } from '../../../../../utils/consts';
 import { Component } from 'preact';
 import { connect } from 'unistore/preact';
+import { WEBSOCKET_MESSAGE_TYPES } from '../../../../../../../server/utils/constants';
 
 class SetupTab extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      tuyaConnectionStatus: null,
+      tuyaConnectionError: null,
+      tuyaConnected: false,
+      tuyaConnecting: false,
+      showClientSecret: false
+    };
+  }
+
   componentWillMount() {
     this.getTuyaConfiguration();
+    this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS, this.updateConnectionStatus);
+    this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.TUYA.ERROR, this.displayConnectionError);
+  }
+
+  componentWillUnmount() {
+    this.props.session.dispatcher.removeListener(WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS, this.updateConnectionStatus);
+    this.props.session.dispatcher.removeListener(WEBSOCKET_MESSAGE_TYPES.TUYA.ERROR, this.displayConnectionError);
   }
 
   async getTuyaConfiguration() {
@@ -15,13 +34,15 @@ class SetupTab extends Component {
     let tuyaAccessKey = '';
     let tuyaSecretKey = '';
     let tuyaAppAccountId = '';
+    let tuyaAppUsername = '';
 
     this.setState({
       tuyaGetSettingsStatus: RequestStatus.Getting,
       tuyaEndpoint,
       tuyaAccessKey,
       tuyaSecretKey,
-      tuyaAppAccountId
+      tuyaAppAccountId,
+      tuyaAppUsername
     });
     try {
       const { value: endpoint } = await this.props.httpClient.get('/api/v1/service/tuya/variable/TUYA_ENDPOINT');
@@ -38,12 +59,18 @@ class SetupTab extends Component {
       );
       tuyaAppAccountId = appAccountId;
 
+      const { value: appUsername } = await this.props.httpClient.get(
+        '/api/v1/service/tuya/variable/TUYA_APP_USERNAME'
+      );
+      tuyaAppUsername = appUsername;
+
       this.setState({
         tuyaGetSettingsStatus: RequestStatus.Success,
         tuyaEndpoint,
         tuyaAccessKey,
         tuyaSecretKey,
-        tuyaAppAccountId
+        tuyaAppAccountId,
+        tuyaAppUsername
       });
     } catch (e) {
       this.setState({
@@ -55,7 +82,11 @@ class SetupTab extends Component {
   saveTuyaConfiguration = async e => {
     e.preventDefault();
     this.setState({
-      tuyaSaveSettingsStatus: RequestStatus.Getting
+      tuyaSaveSettingsStatus: RequestStatus.Getting,
+      tuyaConnectionStatus: null,
+      tuyaConnectionError: null,
+      tuyaConnected: false,
+      tuyaConnecting: false
     });
     try {
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_ENDPOINT', {
@@ -74,16 +105,67 @@ class SetupTab extends Component {
         value: this.state.tuyaAppAccountId.trim()
       });
 
+      await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_APP_USERNAME', {
+        value: this.state.tuyaAppUsername.trim()
+      });
+
       // start service
-      await this.props.httpClient.post('/api/v1/service/tuya/start');
+      const service = await this.props.httpClient.post('/api/v1/service/tuya/start');
+      if (service && service.status === 'ERROR') {
+        throw new Error('TUYA_START_ERROR');
+      }
       this.setState({
         tuyaSaveSettingsStatus: RequestStatus.Success
       });
     } catch (e) {
+      const responseMessage =
+        (e && e.response && e.response.data && e.response.data.message) ||
+        (e && e.message && e.message !== 'TUYA_START_ERROR' ? e.message : null);
+      this.setState({
+        tuyaSaveSettingsStatus: RequestStatus.Error,
+        tuyaConnectionError: responseMessage
+      });
+    }
+  };
+
+  updateConnectionStatus = event => {
+    const status = event && event.status;
+    const error = event && event.error;
+    if (status === 'connecting') {
+      this.setState({
+        tuyaConnectionStatus: RequestStatus.Success,
+        tuyaConnecting: true,
+        tuyaConnected: false
+      });
+      return;
+    }
+    if (status === 'connected') {
       this.setState({
-        tuyaSaveSettingsStatus: RequestStatus.Error
+        tuyaConnectionStatus: RequestStatus.Success,
+        tuyaConnectionError: null,
+        tuyaConnecting: false,
+        tuyaConnected: true
       });
+      return;
     }
+    if (status === 'error') {
+      this.setState({
+        tuyaConnectionStatus: RequestStatus.Error,
+        tuyaConnecting: false,
+        tuyaConnected: false,
+        tuyaConnectionError: error || this.state.tuyaConnectionError
+      });
+    }
+  };
+
+  displayConnectionError = error => {
+    const message = (error && error.message) || (error && error.payload && error.payload.message);
+    this.setState({
+      tuyaConnectionStatus: RequestStatus.Error,
+      tuyaConnectionError: message || 'unknown',
+      tuyaConnecting: false,
+      tuyaConnected: false
+    });
   };
 
   updateConfiguration = e => {
@@ -92,6 +174,12 @@ class SetupTab extends Component {
     });
   };
 
+  toggleClientSecret = () => {
+    this.setState({
+      showClientSecret: !this.state.showClientSecret
+    });
+  };
+
   render(props, state) {
     return (
       <div class="card">
@@ -108,6 +196,36 @@ class SetupTab extends Component {
           >
             <div class="loader" />
             <div class="dimmer-content">
+              {state.tuyaSaveSettingsStatus === RequestStatus.Error && (
+                <div class="alert alert-danger">
+                  <Text id="integration.tuya.setup.error" />
+                  {state.tuyaConnectionError && !state.tuyaConnecting && !state.tuyaConnected && (
+                    <div class="mt-2">
+                      <code>{state.tuyaConnectionError}</code>
+                    </div>
+                  )}
+                </div>
+              )}
+              {state.tuyaConnecting && (
+                <p class="alert alert-info">
+                  <Text id="integration.tuya.setup.connecting" />
+                </p>
+              )}
+              {state.tuyaConnected && (
+                <p class="alert alert-success">
+                  <Text id="integration.tuya.setup.connected" />
+                </p>
+              )}
+              {state.tuyaConnectionStatus === RequestStatus.Error && (
+                <div class="alert alert-danger">
+                  <Text id="integration.tuya.setup.connectionError" />
+                  {state.tuyaConnectionError && (
+                    <div class="mt-2">
+                      <code>{state.tuyaConnectionError}</code>
+                    </div>
+                  )}
+                </div>
+              )}
               <p>
                 <MarkupText id="integration.tuya.setup.description" />
                 <MarkupText id="integration.tuya.setup.descriptionCreateAccount" />
@@ -169,12 +287,39 @@ class SetupTab extends Component {
                   <label htmlFor="tuyaSecretKey" className="form-label">
                     <Text id={`integration.tuya.setup.secretKey`} />
                   </label>
+                  <div class="input-icon mb-3">
+                    <Localizer>
+                      <input
+                        name="tuyaSecretKey"
+                        type={state.showClientSecret ? 'text' : 'password'}
+                        placeholder={<Text id="integration.tuya.setup.secretKeyPlaceholder" />}
+                        value={state.tuyaSecretKey}
+                        className="form-control"
+                        autocomplete="off"
+                        onInput={this.updateConfiguration}
+                      />
+                    </Localizer>
+                    <span class="input-icon-addon cursor-pointer" onClick={this.toggleClientSecret}>
+                      <i
+                        class={cx('fe', {
+                          'fe-eye': !state.showClientSecret,
+                          'fe-eye-off': state.showClientSecret
+                        })}
+                      />
+                    </span>
+                  </div>
+                </div>
+
+                <div class="form-group">
+                  <label htmlFor="tuyaAppAccountId" className="form-label">
+                    <Text id={`integration.tuya.setup.appAccountId`} />
+                  </label>
                   <Localizer>
                     <input
-                      name="tuyaSecretKey"
+                      name="tuyaAppAccountId"
                       type="text"
-                      placeholder={<Text id="integration.tuya.setup.secretKeyPlaceholder" />}
-                      value={state.tuyaSecretKey}
+                      placeholder={<Text id="integration.tuya.setup.appAccountIdPlaceholder" />}
+                      value={state.tuyaAppAccountId}
                       className="form-control"
                       onInput={this.updateConfiguration}
                     />
@@ -182,15 +327,15 @@ class SetupTab extends Component {
                 </div>
 
                 <div class="form-group">
-                  <label htmlFor="tuyaAppAccountId" className="form-label">
-                    <Text id={`integration.tuya.setup.appAccountId`} />
+                  <label htmlFor="tuyaAppUsername" className="form-label">
+                    <Text id={`integration.tuya.setup.appUsername`} />
                   </label>
                   <Localizer>
                     <input
-                      name="tuyaAppAccountId"
+                      name="tuyaAppUsername"
                       type="text"
-                      placeholder={<Text id="integration.tuya.setup.appAccountIdPlaceholder" />}
-                      value={state.tuyaAppAccountId}
+                      placeholder={<Text id="integration.tuya.setup.appUsernamePlaceholder" />}
+                      value={state.tuyaAppUsername}
                       className="form-control"
                       onInput={this.updateConfiguration}
                     />
@@ -213,4 +358,4 @@ class SetupTab extends Component {
   }
 }
 
-export default connect('httpClient', {})(SetupTab);
+export default connect('httpClient,session', {})(SetupTab);
diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index e0ca57440a..2727097210 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -1,4 +1,5 @@
 const { DEVICE_POLL_FREQUENCIES } = require('../../../../utils/constants');
+const { DEVICE_PARAM_NAME } = require('../utils/tuya.constants');
 const { convertFeature } = require('./tuya.convertFeature');
 const logger = require('../../../../utils/logger');
 
@@ -10,11 +11,25 @@ const logger = require('../../../../utils/logger');
  * tuya.convertDevice({ ... });
  */
 function convertDevice(tuyaDevice) {
-  const { name, product_name: model, id, specifications = {} } = tuyaDevice;
+  const { name, product_name: productName, model, id, local_key: localKey, ip, specifications = {} } = tuyaDevice;
   const externalId = `tuya:${id}`;
   const { functions = [], status = [] } = specifications;
+  const online = tuyaDevice.online !== undefined ? tuyaDevice.online : tuyaDevice.is_online;
 
-  logger.debug(`Tuya convert device"${name}, ${model}"`);
+  const params = [];
+  if (id) {
+    params.push({ name: DEVICE_PARAM_NAME.DEVICE_ID, value: id });
+  }
+  if (localKey) {
+    params.push({ name: DEVICE_PARAM_NAME.LOCAL_KEY, value: localKey });
+  }
+  if (ip) {
+    params.push({ name: DEVICE_PARAM_NAME.IP_ADDRESS, value: ip });
+  }
+  logger.debug(`Tuya convert device specifications"`);
+  logger.debug(JSON.stringify(specifications));
+
+  logger.debug(`Tuya convert device"${name}, ${productName || model}"`);
   // Groups functions and status on same code
   const groups = {};
   status.forEach((stat) => {
@@ -33,11 +48,15 @@ function convertDevice(tuyaDevice) {
     features: features.filter((feature) => feature),
     external_id: externalId,
     selector: externalId,
-    model,
+    model: productName || model,
     service_id: this.serviceId,
     poll_frequency: DEVICE_POLL_FREQUENCIES.EVERY_30_SECONDS,
     should_poll: true,
+    params,
   };
+  if (online !== undefined) {
+    device.online = online;
+  }
   return device;
 }
 
diff --git a/server/services/tuya/lib/index.js b/server/services/tuya/lib/index.js
index baff4797c5..d3f84d7ee3 100644
--- a/server/services/tuya/lib/index.js
+++ b/server/services/tuya/lib/index.js
@@ -20,6 +20,7 @@ const TuyaHandler = function TuyaHandler(gladys, serviceId) {
 
   this.connector = null;
   this.status = STATUS.NOT_INITIALIZED;
+  this.lastError = null;
 };
 
 TuyaHandler.prototype.init = init;
diff --git a/server/services/tuya/lib/tuya.connect.js b/server/services/tuya/lib/tuya.connect.js
index af1e0d433e..e63527ffe6 100644
--- a/server/services/tuya/lib/tuya.connect.js
+++ b/server/services/tuya/lib/tuya.connect.js
@@ -21,6 +21,7 @@ async function connect(configuration) {
   }
 
   this.status = STATUS.CONNECTING;
+  this.lastError = null;
   this.gladys.event.emit(EVENTS.WEBSOCKET.SEND_ALL, {
     type: WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS,
     payload: { status: STATUS.CONNECTING },
@@ -35,17 +36,23 @@ async function connect(configuration) {
   });
 
   try {
-    this.connector.client.init();
+    await this.connector.client.init();
     this.status = STATUS.CONNECTED;
     logger.debug('Connected to Tuya');
   } catch (e) {
     this.status = STATUS.ERROR;
+    const message = e && e.message ? e.message : 'Unknown error';
+    this.lastError = message;
     logger.error('Error connecting to Tuya:', e);
+    this.gladys.event.emit(EVENTS.WEBSOCKET.SEND_ALL, {
+      type: WEBSOCKET_MESSAGE_TYPES.TUYA.ERROR,
+      payload: { message },
+    });
   }
 
   this.gladys.event.emit(EVENTS.WEBSOCKET.SEND_ALL, {
     type: WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS,
-    payload: { status: this.status },
+    payload: { status: this.status, error: this.lastError },
   });
 }
 
diff --git a/server/services/tuya/lib/tuya.getConfiguration.js b/server/services/tuya/lib/tuya.getConfiguration.js
index 4b00a0a04e..1938f77fa6 100644
--- a/server/services/tuya/lib/tuya.getConfiguration.js
+++ b/server/services/tuya/lib/tuya.getConfiguration.js
@@ -13,6 +13,7 @@ async function getConfiguration() {
   const endpoint = await this.gladys.variable.getValue(GLADYS_VARIABLES.ENDPOINT, this.serviceId);
   const accessKey = await this.gladys.variable.getValue(GLADYS_VARIABLES.ACCESS_KEY, this.serviceId);
   const secretKey = await this.gladys.variable.getValue(GLADYS_VARIABLES.SECRET_KEY, this.serviceId);
+  const appUsername = await this.gladys.variable.getValue(GLADYS_VARIABLES.APP_USERNAME, this.serviceId);
 
   logger.debug(`Tuya configuration: baseUrl='${endpoint}' accessKey='${accessKey}'`);
   const baseUrl = TUYA_ENDPOINTS[endpoint] || TUYA_ENDPOINTS.china;
@@ -21,6 +22,7 @@ async function getConfiguration() {
     baseUrl,
     accessKey,
     secretKey,
+    appUsername,
   };
 }
 
diff --git a/server/services/tuya/lib/tuya.loadDeviceDetails.js b/server/services/tuya/lib/tuya.loadDeviceDetails.js
index 774910f65d..6d6212f01e 100644
--- a/server/services/tuya/lib/tuya.loadDeviceDetails.js
+++ b/server/services/tuya/lib/tuya.loadDeviceDetails.js
@@ -12,13 +12,25 @@ async function loadDeviceDetails(tuyaDevice) {
   const { id: deviceId } = tuyaDevice;
   logger.debug(`Loading ${deviceId} Tuya device specifications`);
 
-  const responsePage = await this.connector.request({
-    method: 'GET',
-    path: `${API.VERSION_1_2}/devices/${deviceId}/specification`,
-  });
+  const [specificationsResponse, detailsResponse] = await Promise.all([
+    this.connector.request({
+      method: 'GET',
+      path: `${API.VERSION_1_0}/devices/${deviceId}/specification`,
+    }),
+    this.connector.request({
+      method: 'GET',
+      path: `${API.VERSION_1_0}/devices/${deviceId}`,
+    }),
+  ]);
 
-  const { result } = responsePage;
-  return { ...tuyaDevice, specifications: result };
+  const specifications = specificationsResponse.result || {};
+  const details = detailsResponse.result || {};
+
+  // Temporary verbose logging to inspect what Tuya cloud returns
+  logger.debug(`[Tuya] Device details raw for ${deviceId}: ${JSON.stringify(details)}`);
+  logger.debug(`[Tuya] Device specifications raw for ${deviceId}: ${JSON.stringify(specifications)}`);
+
+  return { ...tuyaDevice, ...details, specifications };
 }
 
 module.exports = {
diff --git a/server/services/tuya/lib/tuya.loadDevices.js b/server/services/tuya/lib/tuya.loadDevices.js
index 09da27c327..11812e5605 100644
--- a/server/services/tuya/lib/tuya.loadDevices.js
+++ b/server/services/tuya/lib/tuya.loadDevices.js
@@ -3,33 +3,33 @@ const { API, GLADYS_VARIABLES } = require('./utils/tuya.constants');
 
 /**
  * @description Discover Tuya cloud devices.
- * @param {string} lastRowKey - Key of last row to start with.
+ * @param {number} pageNo - Page number.
+ * @param {number} pageSize - Page size.
  * @returns {Promise} List of discovered devices.
  * @example
  * await loadDevices();
  */
-async function loadDevices(lastRowKey = null) {
+async function loadDevices(pageNo = 1, pageSize = 100) {
   const sourceId = await this.gladys.variable.getValue(GLADYS_VARIABLES.APP_ACCOUNT_UID, this.serviceId);
 
   const responsePage = await this.connector.request({
     method: 'GET',
-    path: `${API.VERSION_1_3}/devices`,
+    path: `${API.PUBLIC_VERSION_1_0}/users/${sourceId}/devices`,
     query: {
-      last_row_key: lastRowKey,
-      source_type: 'tuyaUser',
-      source_id: sourceId,
+      page_no: pageNo,
+      page_size: pageSize,
     },
   });
 
-  const { result } = responsePage;
-  const { list, has_more: hasMore, last_row_key: nextLastRowKey, total } = result;
+  const result = responsePage.result || [];
+  const list = Array.isArray(result) ? result : result.list || [];
 
-  if (hasMore) {
-    const nextResult = await this.loadDevices(nextLastRowKey);
+  if (list.length === pageSize) {
+    const nextResult = await this.loadDevices(pageNo + 1, pageSize);
     nextResult.forEach((device) => list.push(device));
   }
 
-  logger.debug(`${list.length} / ${total} Tuya devices loaded`);
+  logger.debug(`${list.length} Tuya devices loaded`);
 
   return list;
 }
diff --git a/server/services/tuya/lib/tuya.saveConfiguration.js b/server/services/tuya/lib/tuya.saveConfiguration.js
index 5d72ac2fe7..561c8610ff 100644
--- a/server/services/tuya/lib/tuya.saveConfiguration.js
+++ b/server/services/tuya/lib/tuya.saveConfiguration.js
@@ -11,11 +11,12 @@ const { GLADYS_VARIABLES } = require('./utils/tuya.constants');
  */
 async function saveConfiguration(configuration) {
   logger.debug('Saving Tuya configuration...');
-  const { endpoint, accessKey, secretKey, appAccountId } = configuration;
+  const { endpoint, accessKey, secretKey, appAccountId, appUsername } = configuration;
   await this.gladys.variable.setValue(GLADYS_VARIABLES.ENDPOINT, endpoint, this.serviceId);
   await this.gladys.variable.setValue(GLADYS_VARIABLES.ACCESS_KEY, accessKey, this.serviceId);
   await this.gladys.variable.setValue(GLADYS_VARIABLES.SECRET_KEY, secretKey, this.serviceId);
   await this.gladys.variable.setValue(GLADYS_VARIABLES.APP_ACCOUNT_UID, appAccountId, this.serviceId);
+  await this.gladys.variable.setValue(GLADYS_VARIABLES.APP_USERNAME, appUsername, this.serviceId);
 
   return configuration;
 }
diff --git a/server/services/tuya/lib/utils/tuya.constants.js b/server/services/tuya/lib/utils/tuya.constants.js
index a4e0188b94..b75717c252 100644
--- a/server/services/tuya/lib/utils/tuya.constants.js
+++ b/server/services/tuya/lib/utils/tuya.constants.js
@@ -5,6 +5,7 @@ const GLADYS_VARIABLES = {
   ACCESS_TOKEN: 'TUYA_ACCESS_TOKEN',
   REFRESH_TOKEN: 'TUYA_REFRESH_TOKEN',
   APP_ACCOUNT_UID: 'TUYA_APP_ACCOUNT_UID',
+  APP_USERNAME: 'TUYA_APP_USERNAME',
 };
 
 const TUYA_ENDPOINTS = {
@@ -25,15 +26,23 @@ const STATUS = {
 };
 
 const API = {
+  PUBLIC_VERSION_1_0: '/v1.0',
   VERSION_1_0: '/v1.0/iot-03',
   VERSION_1_1: '/v1.1/iot-03',
   VERSION_1_2: '/v1.2/iot-03',
   VERSION_1_3: '/v1.3/iot-03',
 };
 
+const DEVICE_PARAM_NAME = {
+  DEVICE_ID: 'DEVICE_ID',
+  LOCAL_KEY: 'LOCAL_KEY',
+  IP_ADDRESS: 'IP_ADDRESS',
+};
+
 module.exports = {
   GLADYS_VARIABLES,
   TUYA_ENDPOINTS,
   STATUS,
   API,
+  DEVICE_PARAM_NAME,
 };
diff --git a/server/test/services/tuya/lib/tuya.connect.test.js b/server/test/services/tuya/lib/tuya.connect.test.js
index 6a3b646fa3..7335394174 100644
--- a/server/test/services/tuya/lib/tuya.connect.test.js
+++ b/server/test/services/tuya/lib/tuya.connect.test.js
@@ -103,7 +103,7 @@ describe('TuyaHandler.connect', () => {
     });
     assert.calledWith(gladys.event.emit, EVENTS.WEBSOCKET.SEND_ALL, {
       type: WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS,
-      payload: { status: STATUS.CONNECTED },
+      payload: { status: STATUS.CONNECTED, error: null },
     });
   });
 
@@ -120,14 +120,18 @@ describe('TuyaHandler.connect', () => {
 
     assert.calledOnce(client.init);
 
-    assert.callCount(gladys.event.emit, 2);
+    assert.callCount(gladys.event.emit, 3);
     assert.calledWith(gladys.event.emit, EVENTS.WEBSOCKET.SEND_ALL, {
       type: WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS,
       payload: { status: STATUS.CONNECTING },
     });
+    assert.calledWith(gladys.event.emit, EVENTS.WEBSOCKET.SEND_ALL, {
+      type: WEBSOCKET_MESSAGE_TYPES.TUYA.ERROR,
+      payload: { message: 'Error' },
+    });
     assert.calledWith(gladys.event.emit, EVENTS.WEBSOCKET.SEND_ALL, {
       type: WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS,
-      payload: { status: STATUS.ERROR },
+      payload: { status: STATUS.ERROR, error: 'Error' },
     });
   });
 });
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index 7c537b429d..8917af30a2 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -31,7 +31,18 @@ describe('TuyaHandler.discoverDevices', () => {
       request: sinon
         .stub()
         .onFirstCall()
-        .resolves({ result: { list: [{ name: 'name', id: 'uuid', product_name: 'model' }] } })
+        .resolves({
+          result: [
+            {
+              name: 'name',
+              id: 'uuid',
+              product_name: 'model',
+              local_key: 'localKey',
+              ip: '1.1.1.1',
+              online: true,
+            },
+          ],
+        })
         .onSecondCall()
         .resolves({
           result: {
@@ -52,6 +63,13 @@ describe('TuyaHandler.discoverDevices', () => {
             ],
           },
         }),
+        .onThirdCall()
+        .resolves({
+          result: {
+            local_key: 'localKey',
+            ip: '1.1.1.1',
+          },
+        }),
     };
   });
 
@@ -130,9 +148,24 @@ describe('TuyaHandler.discoverDevices', () => {
         model: 'model',
         name: 'name',
         poll_frequency: 30000,
+        params: [
+          {
+            name: 'DEVICE_ID',
+            value: 'uuid',
+          },
+          {
+            name: 'LOCAL_KEY',
+            value: 'localKey',
+          },
+          {
+            name: 'IP_ADDRESS',
+            value: '1.1.1.1',
+          },
+        ],
         selector: 'tuya:uuid',
         service_id: 'ffa13430-df93-488a-9733-5c540e9558e0',
         should_poll: true,
+        online: true,
       },
     ]);
 
@@ -146,6 +179,6 @@ describe('TuyaHandler.discoverDevices', () => {
       payload: { status: STATUS.CONNECTED },
     });
 
-    assert.calledTwice(tuyaHandler.connector.request);
+    assert.callCount(tuyaHandler.connector.request, 3);
   });
 });
diff --git a/server/test/services/tuya/lib/tuya.getConfiguration.test.js b/server/test/services/tuya/lib/tuya.getConfiguration.test.js
index fad9a7c485..7eda1c40cd 100644
--- a/server/test/services/tuya/lib/tuya.getConfiguration.test.js
+++ b/server/test/services/tuya/lib/tuya.getConfiguration.test.js
@@ -31,7 +31,9 @@ describe('TuyaHandler.getConfiguration', () => {
       .withArgs(GLADYS_VARIABLES.ACCESS_KEY, serviceId)
       .returns('accessKey')
       .withArgs(GLADYS_VARIABLES.SECRET_KEY, serviceId)
-      .returns('secretKey');
+      .returns('secretKey')
+      .withArgs(GLADYS_VARIABLES.APP_USERNAME, serviceId)
+      .returns('user@example.com');
 
     const config = await tuyaHandler.getConfiguration();
 
@@ -39,11 +41,13 @@ describe('TuyaHandler.getConfiguration', () => {
       baseUrl: 'https://openapi-ueaz.tuyaus.com',
       accessKey: 'accessKey',
       secretKey: 'secretKey',
+      appUsername: 'user@example.com',
     });
 
-    assert.callCount(gladys.variable.getValue, 3);
+    assert.callCount(gladys.variable.getValue, 4);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ENDPOINT, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ACCESS_KEY, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.SECRET_KEY, serviceId);
+    assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.APP_USERNAME, serviceId);
   });
 });
diff --git a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
index e3b024b6be..5b9406e3f3 100644
--- a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
@@ -15,7 +15,12 @@ describe('TuyaHandler.loadDeviceDetails', () => {
   beforeEach(() => {
     sinon.reset();
     tuyaHandler.connector = {
-      request: fake.resolves({ result: { details: 'details' } }),
+      request: sinon
+        .stub()
+        .onFirstCall()
+        .resolves({ result: { details: 'specification' } })
+        .onSecondCall()
+        .resolves({ result: { local_key: 'localKey' } }),
     };
   });
 
@@ -26,12 +31,16 @@ describe('TuyaHandler.loadDeviceDetails', () => {
   it('should load device details', async () => {
     const devices = await tuyaHandler.loadDeviceDetails({ id: 1 });
 
-    expect(devices).to.deep.eq({ id: 1, specifications: { details: 'details' } });
+    expect(devices).to.deep.eq({ id: 1, local_key: 'localKey', specifications: { details: 'specification' } });
 
-    assert.callCount(tuyaHandler.connector.request, 1);
+    assert.callCount(tuyaHandler.connector.request, 2);
     assert.calledWith(tuyaHandler.connector.request, {
       method: 'GET',
-      path: `${API.VERSION_1_2}/devices/1/specification`,
+      path: `${API.VERSION_1_0}/devices/1/specification`,
+    });
+    assert.calledWith(tuyaHandler.connector.request, {
+      method: 'GET',
+      path: `${API.VERSION_1_0}/devices/1`,
     });
   });
 });
diff --git a/server/test/services/tuya/lib/tuya.loadDevices.test.js b/server/test/services/tuya/lib/tuya.loadDevices.test.js
index 2ee6cd9d84..61eef3f39a 100644
--- a/server/test/services/tuya/lib/tuya.loadDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDevices.test.js
@@ -22,9 +22,9 @@ describe('TuyaHandler.loadDevices', () => {
       request: sinon
         .stub()
         .onFirstCall()
-        .resolves({ result: { list: [{ id: 1 }], total: 2, has_more: true, last_row_key: 'next' } })
+        .resolves({ result: [{ id: 1 }] })
         .onSecondCall()
-        .resolves({ result: { list: [{ id: 2 }], total: 2, has_more: false } }),
+        .resolves({ result: [{ id: 2 }] }),
     };
   });
 
@@ -33,20 +33,20 @@ describe('TuyaHandler.loadDevices', () => {
   });
 
   it('should loop on pages', async () => {
-    const devices = await tuyaHandler.loadDevices();
+    const devices = await tuyaHandler.loadDevices(1, 1);
 
     expect(devices).to.deep.eq([{ id: 1 }, { id: 2 }]);
 
     assert.callCount(tuyaHandler.connector.request, 2);
     assert.calledWith(tuyaHandler.connector.request, {
       method: 'GET',
-      path: `${API.VERSION_1_3}/devices`,
-      query: { last_row_key: null, source_id: 'APP_ACCOUNT_UID', source_type: 'tuyaUser' },
+      path: `${API.PUBLIC_VERSION_1_0}/users/APP_ACCOUNT_UID/devices`,
+      query: { page_no: 1, page_size: 1 },
     });
     assert.calledWith(tuyaHandler.connector.request, {
       method: 'GET',
-      path: `${API.VERSION_1_3}/devices`,
-      query: { last_row_key: 'next', source_id: 'APP_ACCOUNT_UID', source_type: 'tuyaUser' },
+      path: `${API.PUBLIC_VERSION_1_0}/users/APP_ACCOUNT_UID/devices`,
+      query: { page_no: 2, page_size: 1 },
     });
   });
 });
diff --git a/server/test/services/tuya/lib/tuya.saveConfiguration.test.js b/server/test/services/tuya/lib/tuya.saveConfiguration.test.js
index a07c47b576..c7e41dc6ce 100644
--- a/server/test/services/tuya/lib/tuya.saveConfiguration.test.js
+++ b/server/test/services/tuya/lib/tuya.saveConfiguration.test.js
@@ -30,16 +30,18 @@ describe('TuyaHandler.saveConfiguration', () => {
       accessKey: 'accessKey',
       secretKey: 'secretKey',
       appAccountId: 'appAccountUID',
+      appUsername: 'user@example.com',
     };
 
     const config = await tuyaHandler.saveConfiguration(configuration);
 
     expect(config).to.deep.eq(configuration);
 
-    assert.callCount(gladys.variable.setValue, 4);
+    assert.callCount(gladys.variable.setValue, 5);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.ENDPOINT, 'endpoint', serviceId);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.ACCESS_KEY, 'accessKey', serviceId);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.SECRET_KEY, 'secretKey', serviceId);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.APP_ACCOUNT_UID, 'appAccountUID', serviceId);
+    assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.APP_USERNAME, 'user@example.com', serviceId);
   });
 });
diff --git a/server/utils/constants.js b/server/utils/constants.js
index 02898ae9da..7743df7691 100644
--- a/server/utils/constants.js
+++ b/server/utils/constants.js
@@ -1362,6 +1362,7 @@ const WEBSOCKET_MESSAGE_TYPES = {
   TUYA: {
     STATUS: 'tuya.status',
     DISCOVER: 'tuya.discover',
+    ERROR: 'tuya.error',
   },
   NETATMO: {
     STATUS: 'netatmo.status',

From db22529d92d6902a7806a66fdabbf3bedcb2f1da Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Wed, 11 Feb 2026 15:59:04 +0100
Subject: [PATCH 02/90] add local discovery metadata

---
 front/src/config/i18n/de.json                 |   3 +-
 front/src/config/i18n/en.json                 |   3 +-
 front/src/config/i18n/fr.json                 |   3 +-
 .../integration/all/tuya/TuyaDeviceBox.jsx    |  14 +++
 .../tuya/lib/device/tuya.convertDevice.js     |  16 ++-
 server/services/tuya/lib/index.js             |   2 +
 .../services/tuya/lib/tuya.discoverDevices.js |  20 ++++
 server/services/tuya/lib/tuya.localScan.js    |  78 ++++++++++++++
 .../services/tuya/lib/utils/tuya.constants.js |   1 +
 server/services/tuya/package-lock.json        | 102 +++++++++++++++++-
 server/services/tuya/package.json             |   3 +-
 .../tuya/lib/tuya.discoverDevices.test.js     |   1 +
 12 files changed, 239 insertions(+), 7 deletions(-)
 create mode 100644 server/services/tuya/lib/tuya.localScan.js

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 1af20b6c5b..2da9526968 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1177,7 +1177,8 @@
         "noDeviceFound": "Du hast noch keine Tuya-Geräte hinzugefügt.",
         "featuresLabel": "Funktionen",
         "idLabel": "Geräte-ID",
-        "localKeyLabel": "Lokaler Schlüssel"
+        "localKeyLabel": "Lokaler Schlüssel",
+        "protocolVersionLabel": "Protokollversion"
       },
       "discover": {
         "title": "In deinem Tuya-Cloud-Account erkannte Geräte",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index 8972039793..e38ea96c8d 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1072,7 +1072,8 @@
         "noDeviceFound": "No Tuya device found.",
         "featuresLabel": "Features",
         "idLabel": "Device ID",
-        "localKeyLabel": "Local Key"
+        "localKeyLabel": "Local Key",
+        "protocolVersionLabel": "Protocol Version"
       },
       "discover": {
         "title": "Devices detected on your Tuya cloud account",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index c9cb42e5a3..b69516845f 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1307,7 +1307,8 @@
         "noDeviceFound": "Aucun appareil Tuya trouvé.",
         "featuresLabel": "Fonctionnalités",
         "idLabel": "Identifiant de l'appareil",
-        "localKeyLabel": "Clé locale"
+        "localKeyLabel": "Clé locale",
+        "protocolVersionLabel": "Version du protocole"
       },
       "discover": {
         "title": "Appareils détectés sur votre compte cloud Tuya",
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 39723f0124..513d5de1ec 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -114,6 +114,7 @@ class TuyaDeviceBox extends Component {
     }, {});
     const deviceId = params.DEVICE_ID || (device.external_id ? device.external_id.split(':')[1] : '');
     const localKey = params.LOCAL_KEY || device.local_key || '';
+    const protocolVersion = params.PROTOCOL_VERSION || device.protocol_version || '';
 
     return (
       <div class="col-md-6">
@@ -213,6 +214,19 @@ class TuyaDeviceBox extends Component {
                   />
                 </div>
 
+                <div class="form-group">
+                  <label class="form-label" for={`protocol_${deviceIndex}`}>
+                    <Text id="integration.tuya.device.protocolVersionLabel" />
+                  </label>
+                  <input
+                    id={`protocol_${deviceIndex}`}
+                    type="text"
+                    value={protocolVersion}
+                    class="form-control"
+                    disabled="true"
+                  />
+                </div>
+
                 <div class="form-group">
                   <label class="form-label" for={`room_${deviceIndex}`}>
                     <Text id="integration.tuya.roomLabel" />
diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index 2727097210..d78041a601 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -11,7 +11,16 @@ const logger = require('../../../../utils/logger');
  * tuya.convertDevice({ ... });
  */
 function convertDevice(tuyaDevice) {
-  const { name, product_name: productName, model, id, local_key: localKey, ip, specifications = {} } = tuyaDevice;
+  const {
+    name,
+    product_name: productName,
+    model,
+    id,
+    local_key: localKey,
+    ip,
+    protocol_version: protocolVersion,
+    specifications = {},
+  } = tuyaDevice;
   const externalId = `tuya:${id}`;
   const { functions = [], status = [] } = specifications;
   const online = tuyaDevice.online !== undefined ? tuyaDevice.online : tuyaDevice.is_online;
@@ -26,8 +35,11 @@ function convertDevice(tuyaDevice) {
   if (ip) {
     params.push({ name: DEVICE_PARAM_NAME.IP_ADDRESS, value: ip });
   }
+  if (protocolVersion) {
+    params.push({ name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: protocolVersion });
+  }
   logger.debug(`Tuya convert device specifications"`);
-  logger.debug(JSON.stringify(specifications));
+  logger.debug(JSON.stringify(tuyaDevice));
 
   logger.debug(`Tuya convert device"${name}, ${productName || model}"`);
   // Groups functions and status on same code
diff --git a/server/services/tuya/lib/index.js b/server/services/tuya/lib/index.js
index d3f84d7ee3..873b7900b4 100644
--- a/server/services/tuya/lib/index.js
+++ b/server/services/tuya/lib/index.js
@@ -11,6 +11,7 @@ const { loadDevices } = require('./tuya.loadDevices');
 const { loadDeviceDetails } = require('./tuya.loadDeviceDetails');
 const { setValue } = require('./tuya.setValue');
 const { poll } = require('./tuya.poll');
+const { localScan } = require('./tuya.localScan');
 
 const { STATUS } = require('./utils/tuya.constants');
 
@@ -36,5 +37,6 @@ TuyaHandler.prototype.loadDevices = loadDevices;
 TuyaHandler.prototype.loadDeviceDetails = loadDeviceDetails;
 TuyaHandler.prototype.setValue = setValue;
 TuyaHandler.prototype.poll = poll;
+TuyaHandler.prototype.localScan = localScan;
 
 module.exports = TuyaHandler;
diff --git a/server/services/tuya/lib/tuya.discoverDevices.js b/server/services/tuya/lib/tuya.discoverDevices.js
index 333e6bb4ee..a8421c85c8 100644
--- a/server/services/tuya/lib/tuya.discoverDevices.js
+++ b/server/services/tuya/lib/tuya.discoverDevices.js
@@ -31,6 +31,14 @@ async function discoverDevices() {
   });
 
   let devices = [];
+  let localDevicesById = {};
+  try {
+    localDevicesById = await this.localScan();
+    logger.debug(`[Tuya] Local UDP scan returned ${Object.keys(localDevicesById).length} device(s)`);
+  } catch (e) {
+    logger.debug('[Tuya] Local UDP scan failed', e);
+  }
+
   try {
     devices = await this.loadDevices();
     logger.info(`${devices.length} Tuya devices found`);
@@ -42,6 +50,18 @@ async function discoverDevices() {
     devices.map((device) => this.loadDeviceDetails(device)),
   ).then((results) => results.filter((result) => result.status === 'fulfilled').map((result) => result.value));
 
+  this.discoveredDevices = this.discoveredDevices.map((device) => {
+    const localInfo = localDevicesById[device.id];
+    if (localInfo) {
+      return {
+        ...device,
+        protocol_version: localInfo.version,
+        ip: device.ip || localInfo.ip,
+      };
+    }
+    return device;
+  });
+
   this.discoveredDevices = this.discoveredDevices
     .map((device) => ({
       ...convertDevice(device),
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
new file mode 100644
index 0000000000..f39d2940c1
--- /dev/null
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -0,0 +1,78 @@
+const dgram = require('dgram');
+const logger = require('../../../utils/logger');
+const { MessageParser } = require('tuyapi/lib/message-parser');
+const { UDP_KEY } = require('tuyapi/lib/config');
+
+const DEFAULT_PORTS = [6666, 6667, 7000];
+
+/**
+ * @description Scan local network for Tuya devices over UDP to retrieve protocol version.
+ * @param {number} timeoutSeconds - Scan duration in seconds.
+ * @returns {Promise<object>} Map of deviceId -> { ip, version, productKey }.
+ */
+async function localScan(timeoutSeconds = 10) {
+  const devices = {};
+  const sockets = [];
+  const parser = new MessageParser({ key: UDP_KEY, version: 3.1 });
+  logger.debug(`[Tuya][localScan] Starting UDP scan for ${timeoutSeconds}s on ports ${DEFAULT_PORTS.join(', ')}`);
+
+  const onMessage = (message) => {
+    let payload;
+    try {
+      const parsed = parser.parse(message);
+      payload = parsed && parsed[0] && parsed[0].payload;
+    } catch (e) {
+      return;
+    }
+
+    if (!payload || typeof payload !== 'object') {
+      return;
+    }
+
+    const deviceId = payload.gwId || payload.devId || payload.id;
+    const ip = payload.ip;
+    const version = payload.version;
+    const productKey = payload.productKey;
+
+    if (!deviceId) {
+      return;
+    }
+
+    const isNew = !devices[deviceId];
+    devices[deviceId] = {
+      ip,
+      version,
+      productKey,
+    };
+    if (isNew) {
+      logger.debug(`[Tuya][localScan] Found device ${deviceId} ip=${ip || 'unknown'} version=${version || 'unknown'}`);
+    }
+  };
+
+  DEFAULT_PORTS.forEach((port) => {
+    const socket = dgram.createSocket({ type: 'udp4', reuseAddr: true });
+    socket.on('message', onMessage);
+    socket.on('error', (err) => {
+      logger.debug(`[Tuya][localScan] UDP socket error on port ${port}: ${err.message}`);
+    });
+    socket.bind(port);
+    sockets.push(socket);
+  });
+
+  await new Promise((resolve) => setTimeout(resolve, timeoutSeconds * 1000));
+
+  sockets.forEach((socket) => {
+    try {
+      socket.close();
+    } catch (e) {
+      // ignore
+    }
+  });
+
+  logger.debug(`[Tuya][localScan] Scan complete. Found ${Object.keys(devices).length} device(s).`);
+  return devices;
+}
+
+module.exports = {
+  localScan,
+};
diff --git a/server/services/tuya/lib/utils/tuya.constants.js b/server/services/tuya/lib/utils/tuya.constants.js
index b75717c252..62a6a8f53f 100644
--- a/server/services/tuya/lib/utils/tuya.constants.js
+++ b/server/services/tuya/lib/utils/tuya.constants.js
@@ -37,6 +37,7 @@ const DEVICE_PARAM_NAME = {
   DEVICE_ID: 'DEVICE_ID',
   LOCAL_KEY: 'LOCAL_KEY',
   IP_ADDRESS: 'IP_ADDRESS',
+  PROTOCOL_VERSION: 'PROTOCOL_VERSION',
 };
 
 module.exports = {
diff --git a/server/services/tuya/package-lock.json b/server/services/tuya/package-lock.json
index a760b2762b..73a7164847 100644
--- a/server/services/tuya/package-lock.json
+++ b/server/services/tuya/package-lock.json
@@ -18,7 +18,8 @@
         "win32"
       ],
       "dependencies": {
-        "@tuya/tuya-connector-nodejs": "^2.1.2"
+        "@tuya/tuya-connector-nodejs": "^2.1.2",
+        "tuyapi": "^7.2.0"
       }
     },
     "node_modules/@tuya/tuya-connector-nodejs": {
@@ -30,6 +31,12 @@
         "qs": "^6.10.1"
       }
     },
+    "node_modules/@types/retry": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.5.tgz",
+      "integrity": "sha512-3xSjTp3v03X/lSQLkczaN9UIEwJMoMCA1+Nb5HfbJEQWogdeQIyVtTvxPXDQjZ5zws8rFQfVfRdz03ARihPJgw==",
+      "license": "MIT"
+    },
     "node_modules/axios": {
       "version": "0.21.4",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
@@ -50,6 +57,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "license": "MIT"
+    },
     "node_modules/follow-redirects": {
       "version": "1.15.2",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
@@ -109,6 +132,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
     "node_modules/object-inspect": {
       "version": "1.12.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
@@ -117,6 +146,56 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-queue": {
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.1.tgz",
+      "integrity": "sha512-miQiSxLYPYBxGkrldecZC18OTLjdUqnlRebGzPRiVxB8mco7usCmm7hFuxiTvp93K18JnLtE4KMMycjAu/cQQg==",
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.4",
+        "p-timeout": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.2.0.tgz",
+      "integrity": "sha512-jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/retry": "^0.12.0",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-timeout": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
+      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+      "license": "MIT",
+      "dependencies": {
+        "p-finally": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/qs": {
       "version": "6.11.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz",
@@ -131,6 +210,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -143,6 +231,18 @@
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
+    },
+    "node_modules/tuyapi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/tuyapi/-/tuyapi-7.2.0.tgz",
+      "integrity": "sha512-o32MiO+6w8T9d5HwHA6+EwdNOAs2K13pgCHXK4kXeEAQSUdjbMU4Z3b3y+CHQh1ifxVDBQaU+iUeYPPq66ALFQ==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4.1.1",
+        "p-queue": "6.6.1",
+        "p-retry": "4.2.0",
+        "p-timeout": "3.2.0"
+      }
     }
   }
 }
diff --git a/server/services/tuya/package.json b/server/services/tuya/package.json
index 5047ac17dc..6ecc3f55ef 100644
--- a/server/services/tuya/package.json
+++ b/server/services/tuya/package.json
@@ -13,6 +13,7 @@
     "arm64"
   ],
   "dependencies": {
-    "@tuya/tuya-connector-nodejs": "^2.1.2"
+    "@tuya/tuya-connector-nodejs": "^2.1.2",
+    "tuyapi": "^7.2.0"
   }
 }
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index 8917af30a2..f235f485f3 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -27,6 +27,7 @@ describe('TuyaHandler.discoverDevices', () => {
   beforeEach(() => {
     sinon.reset();
     tuyaHandler.status = STATUS.CONNECTED;
+    tuyaHandler.localScan = fake.resolves({});
     tuyaHandler.connector = {
       request: sinon
         .stub()

From ff5d00120049bcbba13434d2de1f7428bbd1f763 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Wed, 11 Feb 2026 15:59:35 +0100
Subject: [PATCH 03/90] Corrige les URL de l'API locale et du WebSocket pour
 utiliser localhost

---
 front/src/config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/src/config.js b/front/src/config.js
index f29374d2c3..2e8aa5b2af 100644
--- a/front/src/config.js
+++ b/front/src/config.js
@@ -1,7 +1,7 @@
 const local = {
   gladysGatewayApiUrl: process.env.GLADYS_GATEWAY_API_URL || 'https://api.gladysgateway.com',
-  localApiUrl: process.env.LOCAL_API_URL || 'http://10.1.0.62:1443',
-  webSocketUrl: process.env.WEBSOCKET_URL || 'ws://10.1.0.62:1443',
+  localApiUrl: process.env.LOCAL_API_URL || 'http://localhost:1443',
+  webSocketUrl: process.env.WEBSOCKET_URL || 'ws://localhost:1443',
   gatewayMode: process.env.GATEWAY_MODE === 'true',
   demoMode: process.env.DEMO_MODE === 'true',
   demoRequestTime: process.env.DEMO_REQUEST_TIME || 0,

From ab28de0f44d7e3d6f9ea80b1ab24be13ef39311f Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 15 Feb 2026 18:45:20 +0100
Subject: [PATCH 04/90] feat: enhance Tuya device support with air conditioning
 and power meter models

- Added support for air conditioning devices with new mappings and DPS configurations.
- Introduced local polling for Tuya devices to improve responsiveness.
- Enhanced device conversion logic to include additional parameters such as cloud IP and local override.
- Updated feature conversion to utilize advanced DPS mappings for air conditioning.
- Implemented new models for air conditioning and power meter, including specific feature mappings.
- Improved error handling and logging for local polling and device value setting.
- Added unit tests for new feature mappings and conversion logic.
---
 .../AirConditioningModeDeviceFeature.jsx      |  37 ++-
 .../device-features/SetpointDeviceFeature.jsx |   7 +-
 .../device-in-room/device-features/style.css  |  28 ++
 front/src/config/i18n/de.json                 |  22 +-
 front/src/config/i18n/en.json                 |  22 +-
 front/src/config/i18n/fr.json                 |  22 +-
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 287 ++++++++++++++++--
 .../all/tuya/discover-page/DiscoverTab.jsx    |  73 ++---
 server/services/tuya/api/tuya.controller.js   | 114 +++++++
 .../tuya/lib/device/tuya.convertDevice.js     |  27 +-
 .../tuya/lib/device/tuya.convertFeature.js    |  40 ++-
 .../tuya/lib/device/tuya.deviceMapping.js     |  90 ++++++
 .../tuya/lib/dps/air_conditioner.mapping.js   |  84 +++++
 .../tuya/lib/dps/air_conditioner.standard.js  |  86 ++++++
 server/services/tuya/lib/index.js             |   2 +
 .../tuya/lib/models/air_conditioner.js        |  20 ++
 .../tuya/lib/models/airton_air_conditioner.js |  35 +++
 server/services/tuya/lib/models/index.js      |  83 +++++
 .../services/tuya/lib/models/power_meter.js   |  35 +++
 server/services/tuya/lib/models/switch.js     |  37 +++
 server/services/tuya/lib/models/thermostat.js |  35 +++
 .../services/tuya/lib/tuya.discoverDevices.js |  23 +-
 server/services/tuya/lib/tuya.localPoll.js    |  77 +++++
 server/services/tuya/lib/tuya.poll.js         |  63 +++-
 server/services/tuya/lib/tuya.setValue.js     | 108 ++++++-
 .../services/tuya/lib/utils/tuya.constants.js |   5 +
 .../feature/tuya.convertFeature.test.js       |  30 +-
 27 files changed, 1390 insertions(+), 102 deletions(-)
 create mode 100644 server/services/tuya/lib/dps/air_conditioner.mapping.js
 create mode 100644 server/services/tuya/lib/dps/air_conditioner.standard.js
 create mode 100644 server/services/tuya/lib/models/air_conditioner.js
 create mode 100644 server/services/tuya/lib/models/airton_air_conditioner.js
 create mode 100644 server/services/tuya/lib/models/index.js
 create mode 100644 server/services/tuya/lib/models/power_meter.js
 create mode 100644 server/services/tuya/lib/models/switch.js
 create mode 100644 server/services/tuya/lib/models/thermostat.js
 create mode 100644 server/services/tuya/lib/tuya.localPoll.js

diff --git a/front/src/components/boxs/device-in-room/device-features/AirConditioningModeDeviceFeature.jsx b/front/src/components/boxs/device-in-room/device-features/AirConditioningModeDeviceFeature.jsx
index 043b53b9f3..f310e828cc 100644
--- a/front/src/components/boxs/device-in-room/device-features/AirConditioningModeDeviceFeature.jsx
+++ b/front/src/components/boxs/device-in-room/device-features/AirConditioningModeDeviceFeature.jsx
@@ -3,6 +3,7 @@ import { Text } from 'preact-i18n';
 import cx from 'classnames';
 
 import { DeviceFeatureCategoriesIcon } from '../../../../utils/consts';
+import style from './style.css';
 import { AC_MODE } from '../../../../../../server/utils/constants';
 
 const AirConditioningModeDeviceFeature = ({ children, ...props }) => {
@@ -25,18 +26,26 @@ const AirConditioningModeDeviceFeature = ({ children, ...props }) => {
     updateValue(AC_MODE.HEATING);
   }
 
+  function drying() {
+    updateValue(AC_MODE.DRYING);
+  }
+
+  function fan() {
+    updateValue(AC_MODE.FAN);
+  }
+
   return (
     <tr>
       <td>
         <i class={`fe fe-${get(DeviceFeatureCategoriesIcon, `${category}.${type}`, { default: 'sliders' })}`} />
       </td>
-      <td>{props.rowName}</td>
+      <td class={style.airConditioningModeLabel}>{props.rowName}</td>
 
-      <td class="py-0">
+      <td class={style.airConditioningModeControls}>
         <div class="d-flex justify-content-end">
-          <div class="btn-group" role="group">
+          <div class={style.airConditioningModeGroup} role="group">
             <button
-              class={cx('btn btn-sm btn-secondary', {
+              class={cx('btn btn-sm btn-secondary', style.airConditioningModeButton, {
                 active: lastValue === AC_MODE.AUTO
               })}
               onClick={auto}
@@ -44,7 +53,7 @@ const AirConditioningModeDeviceFeature = ({ children, ...props }) => {
               <Text id={`deviceFeatureAction.category.${category}.${type}.auto`} plural={AC_MODE.HEATING} />
             </button>
             <button
-              class={cx('btn btn-sm btn-secondary', {
+              class={cx('btn btn-sm btn-secondary', style.airConditioningModeButton, {
                 active: lastValue === AC_MODE.COOLING
               })}
               onClick={cooling}
@@ -52,13 +61,29 @@ const AirConditioningModeDeviceFeature = ({ children, ...props }) => {
               <Text id={`deviceFeatureAction.category.${category}.${type}.cooling`} plural={AC_MODE.HEATING} />
             </button>
             <button
-              class={cx('btn btn-sm', 'btn-secondary', {
+              class={cx('btn btn-sm', 'btn-secondary', style.airConditioningModeButton, {
                 active: lastValue === AC_MODE.HEATING
               })}
               onClick={heating}
             >
               <Text id={`deviceFeatureAction.category.${category}.${type}.heating`} plural={AC_MODE.HEATING} />
             </button>
+            <button
+              class={cx('btn btn-sm btn-secondary', style.airConditioningModeButton, {
+                active: lastValue === AC_MODE.DRYING
+              })}
+              onClick={drying}
+            >
+              <Text id={`deviceFeatureAction.category.${category}.${type}.drying`} plural={AC_MODE.DRYING} />
+            </button>
+            <button
+              class={cx('btn btn-sm btn-secondary', style.airConditioningModeButton, {
+                active: lastValue === AC_MODE.FAN
+              })}
+              onClick={fan}
+            >
+              <Text id={`deviceFeatureAction.category.${category}.${type}.fan`} plural={AC_MODE.FAN} />
+            </button>
           </div>
         </div>
       </td>
diff --git a/front/src/components/boxs/device-in-room/device-features/SetpointDeviceFeature.jsx b/front/src/components/boxs/device-in-room/device-features/SetpointDeviceFeature.jsx
index 6fd948ac8c..3d4a1143c2 100644
--- a/front/src/components/boxs/device-in-room/device-features/SetpointDeviceFeature.jsx
+++ b/front/src/components/boxs/device-in-room/device-features/SetpointDeviceFeature.jsx
@@ -24,7 +24,8 @@ const DEFAULT_VALUE_BY_CATEGORY = {
 };
 
 const SetpointDeviceFeature = ({ children, ...props }) => {
-  const SETPOINT_STEP = SETPOINT_STEP_BY_CATEGORY[props.deviceFeature.category] || 0.5;
+  const featureStep = props.deviceFeature && props.deviceFeature.step;
+  const SETPOINT_STEP = featureStep || SETPOINT_STEP_BY_CATEGORY[props.deviceFeature.category] || 0.5;
   const DEFAULT_VALUE_IN_CASE_EMPTY = DEFAULT_VALUE_BY_CATEGORY[props.deviceFeature.category] || 0;
 
   function updateValue(value) {
@@ -73,7 +74,7 @@ const SetpointDeviceFeature = ({ children, ...props }) => {
               </div>
               <input
                 type="number"
-                value={props.deviceFeature.last_value}
+                value={isNullOrUndefined(props.deviceFeature.last_value) ? '' : props.deviceFeature.last_value}
                 class={cx('form-control text-center', style.removeNumberArrow)}
                 onChange={updateValueEvent}
                 step={SETPOINT_STEP}
@@ -96,7 +97,7 @@ const SetpointDeviceFeature = ({ children, ...props }) => {
                 <div>
                   <input
                     type="number"
-                    value={props.deviceFeature.last_value}
+                    value={isNullOrUndefined(props.deviceFeature.last_value) ? '' : props.deviceFeature.last_value}
                     class={cx('form-control text-center input-sm', style.removeNumberArrow)}
                     onChange={updateValueEvent}
                     step={SETPOINT_STEP}
diff --git a/front/src/components/boxs/device-in-room/device-features/style.css b/front/src/components/boxs/device-in-room/device-features/style.css
index aa35292ba2..06c2c0eb21 100644
--- a/front/src/components/boxs/device-in-room/device-features/style.css
+++ b/front/src/components/boxs/device-in-room/device-features/style.css
@@ -56,3 +56,31 @@ input[type='range'][class~='light-temperature']::-ms-fill-lower {
 .rangeInput {
   flex: 1;
 }
+
+.airConditioningModeGroup {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.25rem;
+  justify-content: center;
+  align-content: center;
+  max-width: 16rem;
+  margin-left: auto;
+}
+
+.airConditioningModeButton {
+  flex: 0 0 auto;
+  margin: 0;
+}
+
+.airConditioningModeLabel {
+  max-width: 10rem;
+  white-space: normal;
+  line-height: 1.2;
+}
+
+.airConditioningModeControls {
+  padding-top: 0;
+  padding-bottom: 0;
+  vertical-align: middle;
+  width: 17rem;
+}
diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 2da9526968..d4ffea7336 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1178,11 +1178,25 @@
         "featuresLabel": "Funktionen",
         "idLabel": "Geräte-ID",
         "localKeyLabel": "Lokaler Schlüssel",
-        "protocolVersionLabel": "Protokollversion"
-      },
+        "protocolVersionLabel": "Protokollversion",
+        "ipAddressLabel": "IP-Adresse",
+        "productIdLabel": "Produkt-ID",
+        "productIdCloudLabel": "Cloud-Produkt-ID:",
+        "localInfoHelp": "Gib die lokale IP und die Protokollversion ein, wenn du den lokalen Modus nutzen willst. Die Cloud-IP wird zur Referenz gespeichert.",
+        "localPollButton": "Lokales DPS abfragen",
+        "localPollSuccess": "Lokaler Poll OK.",
+        "localPollError": "Lokaler Poll fehlgeschlagen:",
+        "createGithubIssue": "Github-Issue erstellen",
+        "dpMapLabel": "Lokale DPS-Ausgabe"
+      },
+      "unmanagedModelHelp": "Cloud-Modus: du kannst so speichern. Lokaler Modus: lokale IP + Protokoll eintragen und lokalen DPS-Poll starten.",
       "discover": {
         "title": "In deinem Tuya-Cloud-Account erkannte Geräte",
         "description": "Tuya-Geräte werden automatisch erkannt. Deine Tuya-Geräte müssen zuerst zu deinem Tuya-Cloud-Account hinzugefügt werden.",
+        "localDiscoveryInfo": "Lokale Erkennung nutzt UDP-Broadcast. Starte den lokalen UDP-Scan und gib bei Bedarf lokale IP und Protokollversion ein und nutze \"Lokales DPS abfragen\".",
+        "scanInProgress": "Scan läuft... Cloud-Geräte werden abgerufen.",
+        "udpScan": "Lokalen UDP-Scan starten",
+        "udpScanError": "Fehler beim lokalen UDP-Scan.",
         "error": "Fehler beim Entdecken von Tuya-Geräten. Bitte überprüfe deine Login-Daten auf der Einrichtungsseite.",
         "noDeviceFound": "Kein Tuya-Gerät entdeckt.",
         "scan": "Scannen",
@@ -3299,7 +3313,9 @@
         "mode": {
           "auto": "Automatisch",
           "cooling": "Kühlen",
-          "heating": "Heizen"
+          "heating": "Heizen",
+          "drying": "Trocknen",
+          "fan": "Lüften"
         }
       },
       "heater": {
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index e38ea96c8d..ab8635cb4c 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1073,11 +1073,25 @@
         "featuresLabel": "Features",
         "idLabel": "Device ID",
         "localKeyLabel": "Local Key",
-        "protocolVersionLabel": "Protocol Version"
-      },
+        "protocolVersionLabel": "Protocol Version",
+        "ipAddressLabel": "IP Address",
+        "productIdLabel": "Product ID",
+        "productIdCloudLabel": "Cloud product ID:",
+        "localInfoHelp": "Enter the local IP and protocol version if you want to use local mode. The cloud IP is kept for reference.",
+        "localPollButton": "Poll local DPS",
+        "localPollSuccess": "Local poll OK.",
+        "localPollError": "Local poll failed:",
+        "createGithubIssue": "Create a Github issue",
+        "dpMapLabel": "Local DPS output"
+      },
+      "unmanagedModelHelp": "Cloud mode: you can save as-is. Local mode: enter local IP + protocol then run local DPS poll.",
       "discover": {
         "title": "Devices detected on your Tuya cloud account",
         "description": "Tuya devices are automatically discovered. Your Tuya devices need to be added to your Tuya cloud account before.",
+        "localDiscoveryInfo": "Local discovery uses UDP broadcast. Run the local UDP scan, then if needed enter the local IP and protocol version and use \"Poll local DPS\".",
+        "scanInProgress": "Scan in progress... retrieving cloud devices.",
+        "udpScan": "Run local UDP scan",
+        "udpScanError": "Error while running local UDP scan.",
         "error": "Error discovering Tuya devices. Please verify your credentials on Setup.",
         "noDeviceFound": "No Tuya device discovered.",
         "scan": "Scan",
@@ -3299,7 +3313,9 @@
         "mode": {
           "auto": "Auto",
           "cooling": "Cool",
-          "heating": "Heat"
+          "heating": "Heat",
+          "drying": "Dry",
+          "fan": "Fan"
         }
       },
       "heater": {
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index b69516845f..1c1d435867 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1308,11 +1308,25 @@
         "featuresLabel": "Fonctionnalités",
         "idLabel": "Identifiant de l'appareil",
         "localKeyLabel": "Clé locale",
-        "protocolVersionLabel": "Version du protocole"
-      },
+        "protocolVersionLabel": "Version du protocole",
+        "ipAddressLabel": "Adresse IP",
+        "productIdLabel": "Identifiant produit",
+        "productIdCloudLabel": "Identifiant produit cloud :",
+        "localInfoHelp": "Saisissez l'IP locale et la version du protocole si vous souhaitez utiliser le mode local. L'IP cloud est conservée en référence.",
+        "localPollButton": "Poll local des DP",
+        "localPollSuccess": "Poll local OK.",
+        "localPollError": "Échec du poll local :",
+        "createGithubIssue": "Créer une issue Github",
+        "dpMapLabel": "Sortie DPS locale"
+      },
+      "unmanagedModelHelp": "Mode cloud : vous pouvez sauvegarder tel quel. Mode local : renseignez IP locale + protocole puis lancez le poll local des DP.",
       "discover": {
         "title": "Appareils détectés sur votre compte cloud Tuya",
         "description": "Les appareils Tuya sont automatiquement découverts. Vos appareils Tuya doivent être ajoutés à votre compte cloud Tuya avant.",
+        "localDiscoveryInfo": "La découverte locale utilise le broadcast UDP. Lancez le scan UDP local puis, si besoin, renseignez l'IP locale et la version du protocole, et utilisez \"Poll local des DP\".",
+        "scanInProgress": "Scan en cours... récupération cloud des appareils.",
+        "udpScan": "Scanner UDP local",
+        "udpScanError": "Erreur lors du scan UDP local.",
         "error": "Erreur de découverte des appareils Tuya. Veuillez vérifier vos informations d'identification lors de l'installation.",
         "noDeviceFound": "Aucun appareil Tuya n'a été découvert.",
         "scan": "Scanner",
@@ -3299,7 +3313,9 @@
         "mode": {
           "auto": "Auto",
           "cooling": "Clim.",
-          "heating": "Chauffage"
+          "heating": "Chauffage",
+          "drying": "Déshum.",
+          "fan": "Ventilation"
         }
       },
       "heater": {
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 513d5de1ec..6feb922148 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -5,6 +5,41 @@ import { Link } from 'preact-router';
 import get from 'get-value';
 import DeviceFeatures from '../../../../components/device/view/DeviceFeatures';
 import { connect } from 'unistore/preact';
+import { RequestStatus } from '../../../../utils/consts';
+
+const GITHUB_BASE_URL = 'https://github.com/GladysAssistant/Gladys/issues/new';
+
+const sanitizeDeviceForIssue = device => {
+  if (!device) {
+    return device;
+  }
+  const sanitized = { ...device };
+  const params = Array.isArray(device.params) ? device.params.map(param => ({ ...param })) : [];
+  params.forEach(param => {
+    if (['LOCAL_KEY', 'IP_ADDRESS', 'CLOUD_IP'].includes(param.name)) {
+      param.value = '<redacted>';
+    }
+  });
+  sanitized.params = params;
+  if (sanitized.local_key) {
+    sanitized.local_key = '<redacted>';
+  }
+  if (sanitized.ip) {
+    sanitized.ip = '<redacted>';
+  }
+  if (sanitized.cloud_ip) {
+    sanitized.cloud_ip = '<redacted>';
+  }
+  sanitized.mode = sanitized.local_override ? 'local' : 'cloud';
+  return sanitized;
+};
+
+const createGithubUrl = device => {
+  const title = encodeURIComponent(`Tuya: Unsupported device ${device.product_id || device.model || device.name}`);
+  const sanitized = sanitizeDeviceForIssue(device);
+  const body = encodeURIComponent(`\`\`\`\n${JSON.stringify(sanitized, null, 2)}\n\`\`\``);
+  return `${GITHUB_BASE_URL}?title=${title}&body=${body}`;
+};
 
 class TuyaDeviceBox extends Component {
   componentWillMount() {
@@ -37,6 +72,125 @@ class TuyaDeviceBox extends Component {
     });
   };
 
+  updateProtocol = e => {
+    const protocolVersion = e.target.value;
+    const params = Array.isArray(this.state.device.params) ? [...this.state.device.params] : [];
+    const existingIndex = params.findIndex(param => param.name === 'PROTOCOL_VERSION');
+    if (existingIndex >= 0) {
+      params[existingIndex] = { ...params[existingIndex], value: protocolVersion };
+    } else {
+      params.push({ name: 'PROTOCOL_VERSION', value: protocolVersion });
+    }
+    this.setState({
+      device: {
+        ...this.state.device,
+        params
+      }
+    });
+  };
+
+  pollLocal = async () => {
+    this.setState({
+      localPollStatus: RequestStatus.Getting,
+      localPollError: null
+    });
+    const params = Array.isArray(this.state.device.params) ? this.state.device.params : [];
+    const getParam = name => {
+      const found = params.find(param => param.name === name);
+      return found ? found.value : undefined;
+    };
+    const tryProtocols = ['3.5', '3.4', '3.3', '3.1'];
+    const selectedProtocol = getParam('PROTOCOL_VERSION') || this.state.device.protocol_version;
+    const protocolList = selectedProtocol ? [selectedProtocol] : tryProtocols;
+    try {
+      let result = null;
+      let usedProtocol = selectedProtocol;
+      const isValidResult = data => data && typeof data === 'object' && data.dps;
+      for (let i = 0; i < protocolList.length; i += 1) {
+        const protocolVersion = protocolList[i];
+        try {
+          const response = await this.props.httpClient.post('/api/v1/service/tuya/local-poll', {
+            deviceId: this.state.device.external_id && this.state.device.external_id.split(':')[1],
+            ip: getParam('IP_ADDRESS') || this.state.device.ip,
+            localKey: getParam('LOCAL_KEY') || this.state.device.local_key,
+            protocolVersion
+          });
+          result = response && response.dps ? response : null;
+          const updatedDevice = response && response.device ? response.device : null;
+          if (updatedDevice) {
+            this.setState({
+              device: updatedDevice
+            });
+          }
+          if (!isValidResult(result)) {
+            throw new Error('Invalid local poll response');
+          }
+          usedProtocol = protocolVersion;
+          break;
+        } catch (e) {
+          if (i === protocolList.length - 1) {
+            throw e;
+          }
+        }
+      }
+      const newParams = [...params];
+      if (usedProtocol) {
+        const protocolIndex = newParams.findIndex(param => param.name === 'PROTOCOL_VERSION');
+        if (protocolIndex >= 0) {
+          newParams[protocolIndex] = { ...newParams[protocolIndex], value: usedProtocol };
+        } else {
+          newParams.push({ name: 'PROTOCOL_VERSION', value: usedProtocol });
+        }
+      }
+      const existingIndex = newParams.findIndex(param => param.name === 'TUYA_DP_MAP');
+      if (existingIndex >= 0) {
+        newParams[existingIndex] = { ...newParams[existingIndex], value: JSON.stringify(result) };
+      } else {
+        newParams.push({ name: 'TUYA_DP_MAP', value: JSON.stringify(result) });
+      }
+      this.setState({
+        device: {
+          ...this.state.device,
+          params: newParams
+        },
+        localPollStatus: RequestStatus.Success
+      });
+    } catch (e) {
+      const message =
+        (e && e.response && e.response.data && e.response.data.message) || (e && e.message) || 'Unknown error';
+      this.setState({
+        localPollStatus: RequestStatus.Error,
+        localPollError: message
+      });
+    }
+  };
+
+  updateIpAddress = e => {
+    const ipAddress = e.target.value;
+    const params = Array.isArray(this.state.device.params) ? [...this.state.device.params] : [];
+    const existingIndex = params.findIndex(param => param.name === 'IP_ADDRESS');
+    const cloudIpParam = params.find(param => param.name === 'CLOUD_IP');
+    const cloudIp = cloudIpParam ? cloudIpParam.value : undefined;
+    if (existingIndex >= 0) {
+      params[existingIndex] = { ...params[existingIndex], value: ipAddress };
+    } else {
+      params.push({ name: 'IP_ADDRESS', value: ipAddress });
+    }
+    const overrideValue = ipAddress && cloudIp && ipAddress !== cloudIp ? true : false;
+    const overrideIndex = params.findIndex(param => param.name === 'LOCAL_OVERRIDE');
+    if (overrideIndex >= 0) {
+      params[overrideIndex] = { ...params[overrideIndex], value: overrideValue };
+    } else {
+      params.push({ name: 'LOCAL_OVERRIDE', value: overrideValue });
+    }
+    this.setState({
+      device: {
+        ...this.state.device,
+        params
+      }
+    });
+  };
+
   saveDevice = async () => {
     this.setState({
       loading: true,
@@ -104,17 +258,33 @@ class TuyaDeviceBox extends Component {
       selected,
       onToggleSelected
     },
-    { device, loading, errorMessage, tooMuchStatesError, statesNumber }
+    { device, loading, errorMessage, tooMuchStatesError, statesNumber, localPollStatus, localPollError }
   ) {
-    const validModel = device.features && device.features.length > 0;
+    const supportedModel = device.tuya_supported !== false;
+    const validModel = supportedModel;
     const online = device.online;
-    const params = (device.params || []).reduce((acc, param) => {
+    const paramsArray = Array.isArray(device.params) ? device.params : [];
+    const params = paramsArray.reduce((acc, param) => {
       acc[param.name] = param.value;
       return acc;
     }, {});
     const deviceId = params.DEVICE_ID || (device.external_id ? device.external_id.split(':')[1] : '');
     const localKey = params.LOCAL_KEY || device.local_key || '';
     const protocolVersion = params.PROTOCOL_VERSION || device.protocol_version || '';
+    const localOverride =
+      params.LOCAL_OVERRIDE !== undefined && params.LOCAL_OVERRIDE !== null
+        ? params.LOCAL_OVERRIDE
+        : device.local_override;
+    const dpMapParam = paramsArray.find(param => param.name === 'TUYA_DP_MAP');
+    const dpMapValue = dpMapParam ? dpMapParam.value : null;
+    const isJsonDpMap = dpMapValue && typeof dpMapValue === 'string' && dpMapValue.trim().startsWith('{');
+    const ipAddress = params.IP_ADDRESS || device.ip || '';
+    const hasProtocolSelected = protocolVersion && protocolVersion.length > 0;
+    const canPollLocal = ipAddress && localKey;
+    const requiresProtocol = localOverride === true;
+    const canSave = !requiresProtocol || hasProtocolSelected;
+    const productKey = params.PRODUCT_KEY || device.product_key || '';
+    const productId = productKey || device.product_id || '';
 
     return (
       <div class="col-md-6">
@@ -133,7 +303,7 @@ class TuyaDeviceBox extends Component {
                   type="checkbox"
                   class="custom-control-input"
                   checked={selected === true}
-                  disabled={!validModel}
+                  disabled={!validModel || (requiresProtocol && !hasProtocolSelected)}
                   onChange={() => onToggleSelected && onToggleSelected(device.external_id)}
                 />
                 <label class="custom-control-label" for={`select_${deviceIndex}`} />
@@ -170,7 +340,7 @@ class TuyaDeviceBox extends Component {
                       onInput={this.updateName}
                       class="form-control"
                       placeholder={<Text id="integration.tuya.namePlaceholder" />}
-                      disabled={!editable || !validModel}
+                      disabled={!editable}
                     />
                   </Localizer>
                 </div>
@@ -188,6 +358,24 @@ class TuyaDeviceBox extends Component {
                   />
                 </div>
 
+                <div class="form-group">
+                  <label class="form-label" for={`product_id_${deviceIndex}`}>
+                    <Text id="integration.tuya.device.productIdLabel" />
+                  </label>
+                  <input
+                    id={`product_id_${deviceIndex}`}
+                    type="text"
+                    value={productId}
+                    class="form-control"
+                    disabled="true"
+                  />
+                  {productKey && device.product_id && productKey !== device.product_id && (
+                    <small class="form-text text-muted">
+                      <Text id="integration.tuya.device.productIdCloudLabel" /> {device.product_id}
+                    </small>
+                  )}
+                </div>
+
                 <div class="form-group">
                   <label class="form-label" for={`device_id_${deviceIndex}`}>
                     <Text id="integration.tuya.device.idLabel" />
@@ -215,18 +403,73 @@ class TuyaDeviceBox extends Component {
                 </div>
 
                 <div class="form-group">
-                  <label class="form-label" for={`protocol_${deviceIndex}`}>
-                    <Text id="integration.tuya.device.protocolVersionLabel" />
+                  <label class="form-label" for={`ip_${deviceIndex}`}>
+                    <Text id="integration.tuya.device.ipAddressLabel" />
                   </label>
                   <input
-                    id={`protocol_${deviceIndex}`}
+                    id={`ip_${deviceIndex}`}
                     type="text"
-                    value={protocolVersion}
+                    value={ipAddress}
                     class="form-control"
-                    disabled="true"
+                    onInput={this.updateIpAddress}
+                    disabled={!editable}
                   />
+                  <small class="form-text text-muted">
+                    <Text id="integration.tuya.device.localInfoHelp" />
+                  </small>
+                </div>
+
+                <div class="form-group">
+                  <label class="form-label" for={`protocol_${deviceIndex}`}>
+                    <Text id="integration.tuya.device.protocolVersionLabel" />
+                  </label>
+                  <select
+                    id={`protocol_${deviceIndex}`}
+                    class="form-control"
+                    value={protocolVersion}
+                    onChange={this.updateProtocol}
+                    disabled={!editable}
+                  >
+                    <option value="">
+                      <Text id="global.emptySelectOption" />
+                    </option>
+                    <option value="3.1">3.1</option>
+                    <option value="3.3">3.3</option>
+                    <option value="3.4">3.4</option>
+                    <option value="3.5">3.5</option>
+                  </select>
                 </div>
 
+                {(validModel || !supportedModel) && (
+                  <div class="form-group">
+                    <button
+                      onClick={this.pollLocal}
+                      class="btn btn-outline-secondary"
+                      disabled={!canPollLocal || localPollStatus === RequestStatus.Getting}
+                    >
+                      <Text id="integration.tuya.device.localPollButton" />
+                    </button>
+                    {localPollStatus === RequestStatus.Success && (
+                      <span class="text-success ml-2">
+                        <Text id="integration.tuya.device.localPollSuccess" />
+                      </span>
+                    )}
+                    {localPollStatus === RequestStatus.Error && (
+                      <span class="text-danger ml-2">
+                        <Text id="integration.tuya.device.localPollError" /> {localPollError}
+                      </span>
+                    )}
+                    {!supportedModel && dpMapValue && (
+                      <div class="mt-3">
+                        <label class="form-label">
+                          <Text id="integration.tuya.device.dpMapLabel" />
+                        </label>
+                        <pre class="mb-2">{isJsonDpMap ? dpMapValue : JSON.stringify(dpMapValue, null, 2)}</pre>
+                      </div>
+                    )}
+                  </div>
+                )}
+
                 <div class="form-group">
                   <label class="form-label" for={`room_${deviceIndex}`}>
                     <Text id="integration.tuya.roomLabel" />
@@ -235,7 +478,7 @@ class TuyaDeviceBox extends Component {
                     id={`room_${deviceIndex}`}
                     onChange={this.updateRoom}
                     class="form-control"
-                    disabled={!editable || !validModel}
+                    disabled={!editable}
                   >
                     <option value="">
                       <Text id="global.emptySelectOption" />
@@ -270,13 +513,13 @@ class TuyaDeviceBox extends Component {
                   )}
 
                   {validModel && updateButton && (
-                    <button onClick={this.saveDevice} class="btn btn-success mr-2">
+                    <button onClick={this.saveDevice} class="btn btn-success mr-2" disabled={!canSave}>
                       <Text id="integration.tuya.updateButton" />
                     </button>
                   )}
 
                   {validModel && saveButton && (
-                    <button onClick={this.saveDevice} class="btn btn-success mr-2">
+                    <button onClick={this.saveDevice} class="btn btn-success mr-2" disabled={!canSave}>
                       <Text id="integration.tuya.saveButton" />
                     </button>
                   )}
@@ -287,10 +530,20 @@ class TuyaDeviceBox extends Component {
                     </button>
                   )}
 
-                  {!validModel && (
-                    <button class="btn btn-dark" disabled>
-                      <Text id="integration.tuya.unmanagedModelButton" />
-                    </button>
+                  {!supportedModel && (
+                    <div>
+                      <div class="alert alert-warning">
+                        <Text id="integration.tuya.unmanagedModelButton" />
+                      </div>
+                      <div class="alert alert-warning py-1">
+                        <small>
+                          <Text id="integration.tuya.unmanagedModelHelp" />
+                        </small>
+                      </div>
+                      <a class="btn btn-gray" href={createGithubUrl(device)} target="_blank" rel="noopener noreferrer">
+                        <Text id="integration.tuya.device.createGithubIssue" />
+                      </a>
+                    </div>
                   )}
 
                   {validModel && editButton && (
diff --git a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
index 762c702c60..31653696a4 100644
--- a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
+++ b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
@@ -37,8 +37,7 @@ class DiscoverTab extends Component {
 
   getDiscoveredDevices = async () => {
     this.setState({
-      loading: true,
-      selectedDeviceIds: []
+      loading: true
     });
     try {
       const discoveredDevices = await this.props.httpClient.get('/api/v1/service/tuya/discover');
@@ -55,49 +54,32 @@ class DiscoverTab extends Component {
     }
   };
 
-  toggleSelectedDevice = externalId => {
-    const selectedDeviceIds = new Set(this.state.selectedDeviceIds || []);
-    if (selectedDeviceIds.has(externalId)) {
-      selectedDeviceIds.delete(externalId);
-    } else {
-      selectedDeviceIds.add(externalId);
-    }
-    this.setState({
-      selectedDeviceIds: Array.from(selectedDeviceIds)
-    });
-  };
-
-  addSelectedDevices = async () => {
-    const selectedDeviceIds = this.state.selectedDeviceIds || [];
-    const discoveredDevices = this.state.discoveredDevices || [];
-    const devicesToAdd = discoveredDevices.filter(device => selectedDeviceIds.includes(device.external_id));
-
-    if (devicesToAdd.length === 0) {
-      return;
-    }
-
+  runLocalScan = async () => {
     this.setState({
-      addingSelected: true,
-      errorAddingSelected: false
+      udpScanLoading: true,
+      udpScanError: false
     });
-
     try {
-      await Promise.all(devicesToAdd.map(device => this.props.httpClient.post('/api/v1/device', device)));
-      await this.getDiscoveredDevices();
+      const response = await this.props.httpClient.post('/api/v1/service/tuya/local-scan', { timeoutSeconds: 10 });
+      if (response && response.devices) {
+        this.setState({
+          discoveredDevices: response.devices
+        });
+      } else {
+        await this.getDiscoveredDevices();
+      }
       this.setState({
-        addingSelected: false,
-        selectedDeviceIds: []
+        udpScanLoading: false
       });
     } catch (e) {
       this.setState({
-        addingSelected: false,
-        errorAddingSelected: true
+        udpScanLoading: false,
+        udpScanError: true
       });
     }
   };
 
-  render(props, { loading, errorLoading, discoveredDevices, housesWithRooms, selectedDeviceIds, addingSelected, errorAddingSelected }) {
-    const selectedCount = (selectedDeviceIds || []).length;
+  render(props, { loading, errorLoading, discoveredDevices, housesWithRooms, udpScanLoading, udpScanError }) {
     return (
       <div class="card">
         <div class="card-header">
@@ -109,26 +91,34 @@ class DiscoverTab extends Component {
               <Text id="integration.tuya.discover.scan" /> <i class="fe fe-radio" />
             </button>
             <button
-              onClick={this.addSelectedDevices}
+              onClick={this.runLocalScan}
               class="btn btn-outline-success ml-2"
-              disabled={loading || addingSelected || selectedCount === 0}
+              disabled={loading || udpScanLoading}
             >
-              <Text id="integration.tuya.discover.addSelected" />
+              <Text id="integration.tuya.discover.udpScan" />
             </button>
           </div>
         </div>
         <div class="card-body">
+          <div class="alert alert-info">
+            <Text id="integration.tuya.discover.localDiscoveryInfo" />
+          </div>
+          {loading && (
+            <div class="alert alert-info">
+              <Text id="integration.tuya.discover.scanInProgress" />
+            </div>
+          )}
           <div class="alert alert-secondary">
             <Text id="integration.tuya.discover.description" />
           </div>
-          {errorAddingSelected && (
+          {udpScanError && (
             <div class="alert alert-danger">
-              <Text id="integration.tuya.discover.addSelectedError" />
+              <Text id="integration.tuya.discover.udpScanError" />
             </div>
           )}
           <div
             class={cx('dimmer', {
-              active: loading || addingSelected
+              active: loading || udpScanLoading
             })}
           >
             <div class="loader" />
@@ -149,9 +139,6 @@ class DiscoverTab extends Component {
                       alreadyCreatedButton={device.created_at && !device.updatable}
                       updateButton={device.updatable}
                       saveButton={!device.created_at}
-                      selectable={!device.created_at || device.updatable}
-                      selected={selectedDeviceIds && selectedDeviceIds.includes(device.external_id)}
-                      onToggleSelected={this.toggleSelectedDevice}
                       device={device}
                       deviceIndex={index}
                       housesWithRooms={housesWithRooms}
diff --git a/server/services/tuya/api/tuya.controller.js b/server/services/tuya/api/tuya.controller.js
index 439fd52ac4..1c1c6a1c06 100644
--- a/server/services/tuya/api/tuya.controller.js
+++ b/server/services/tuya/api/tuya.controller.js
@@ -1,6 +1,35 @@
 const asyncMiddleware = require('../../../api/middlewares/asyncMiddleware');
+const { DEVICE_PARAM_NAME } = require('../lib/utils/tuya.constants');
 
 module.exports = function TuyaController(tuyaManager) {
+  function upsertParam(params, name, value) {
+    if (value === undefined || value === null) {
+      return;
+    }
+    const index = params.findIndex((param) => param.name === name);
+    if (index >= 0) {
+      params[index] = { ...params[index], value };
+    } else {
+      params.push({ name, value });
+    }
+  }
+
+  function updateDiscoveredDeviceWithLocalInfo(device, localInfo) {
+    if (!device || !localInfo) {
+      return device;
+    }
+    const updated = { ...device };
+    updated.protocol_version = localInfo.version;
+    updated.ip = localInfo.ip || updated.ip;
+    updated.product_key = localInfo.productKey;
+    updated.local_override = true;
+    updated.params = Array.isArray(updated.params) ? [...updated.params] : [];
+    upsertParam(updated.params, DEVICE_PARAM_NAME.IP_ADDRESS, updated.ip);
+    upsertParam(updated.params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, updated.protocol_version);
+    upsertParam(updated.params, DEVICE_PARAM_NAME.PRODUCT_KEY, updated.product_key);
+    upsertParam(updated.params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE, true);
+    return updated;
+  }
   /**
    * @api {get} /api/v1/service/tuya/discover Retrieve tuya devices from cloud.
    * @apiName discover
@@ -11,10 +40,95 @@ module.exports = function TuyaController(tuyaManager) {
     res.json(devices);
   }
 
+  /**
+   * @api {post} /api/v1/service/tuya/local-poll Poll one Tuya device locally to retrieve DPS.
+   * @apiName localPoll
+   * @apiGroup Tuya
+   */
+  async function localPoll(req, res) {
+    const result = await tuyaManager.localPoll(req.body);
+    const { deviceId, ip, protocolVersion, localKey } = req.body || {};
+
+    let updatedDevice = null;
+    if (deviceId && Array.isArray(tuyaManager.discoveredDevices)) {
+      const externalId = `tuya:${deviceId}`;
+      const deviceIndex = tuyaManager.discoveredDevices.findIndex((device) => device.external_id === externalId);
+      if (deviceIndex >= 0) {
+        const device = { ...tuyaManager.discoveredDevices[deviceIndex] };
+        device.protocol_version = protocolVersion;
+        device.ip = ip;
+        device.local_override = true;
+        if (localKey) {
+          device.local_key = localKey;
+        }
+        device.params = Array.isArray(device.params) ? [...device.params] : [];
+        upsertParam(device.params, DEVICE_PARAM_NAME.IP_ADDRESS, ip);
+        upsertParam(device.params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, protocolVersion);
+        upsertParam(device.params, DEVICE_PARAM_NAME.LOCAL_KEY, localKey);
+        upsertParam(device.params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE, true);
+        upsertParam(device.params, DEVICE_PARAM_NAME.DP_MAP, JSON.stringify(result));
+        upsertParam(device.params, DEVICE_PARAM_NAME.PRODUCT_ID, device.product_id);
+        upsertParam(device.params, DEVICE_PARAM_NAME.PRODUCT_KEY, device.product_key);
+
+        tuyaManager.discoveredDevices[deviceIndex] = device;
+        updatedDevice = device;
+      }
+    }
+
+    if (updatedDevice) {
+      res.json({
+        ...result,
+        device: updatedDevice,
+      });
+      return;
+    }
+
+    res.json(result);
+  }
+
+  /**
+   * @api {post} /api/v1/service/tuya/local-scan Manual UDP scan for local Tuya devices.
+   * @apiName localScan
+   * @apiGroup Tuya
+   */
+  async function localScan(req, res) {
+    const { timeoutSeconds } = req.body || {};
+    const localDevicesById = await tuyaManager.localScan(timeoutSeconds);
+
+    if (Array.isArray(tuyaManager.discoveredDevices)) {
+      const updatedDevices = tuyaManager.discoveredDevices.map((device) => {
+        const deviceId = device.external_id && device.external_id.split(':')[1];
+        const localInfo = localDevicesById[deviceId];
+        if (!localInfo) {
+          return device;
+        }
+        return updateDiscoveredDeviceWithLocalInfo(device, localInfo);
+      });
+      tuyaManager.discoveredDevices = updatedDevices;
+      res.json({
+        devices: updatedDevices,
+        local_devices: localDevicesById,
+      });
+      return;
+    }
+
+    res.json({
+      local_devices: localDevicesById,
+    });
+  }
+
   return {
     'get /api/v1/service/tuya/discover': {
       authenticated: true,
       controller: asyncMiddleware(discover),
     },
+    'post /api/v1/service/tuya/local-poll': {
+      authenticated: true,
+      controller: asyncMiddleware(localPoll),
+    },
+    'post /api/v1/service/tuya/local-scan': {
+      authenticated: true,
+      controller: asyncMiddleware(localScan),
+    },
   };
 };
diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index d78041a601..c6ec420b14 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -1,5 +1,6 @@
 const { DEVICE_POLL_FREQUENCIES } = require('../../../../utils/constants');
 const { DEVICE_PARAM_NAME } = require('../utils/tuya.constants');
+const { getSupportForDevice } = require('../models');
 const { convertFeature } = require('./tuya.convertFeature');
 const logger = require('../../../../utils/logger');
 
@@ -15,10 +16,14 @@ function convertDevice(tuyaDevice) {
     name,
     product_name: productName,
     model,
+    product_id: productId,
+    product_key: productKey,
     id,
     local_key: localKey,
     ip,
+    cloud_ip: cloudIp,
     protocol_version: protocolVersion,
+    local_override: localOverride,
     specifications = {},
   } = tuyaDevice;
   const externalId = `tuya:${id}`;
@@ -35,9 +40,21 @@ function convertDevice(tuyaDevice) {
   if (ip) {
     params.push({ name: DEVICE_PARAM_NAME.IP_ADDRESS, value: ip });
   }
+  if (cloudIp) {
+    params.push({ name: DEVICE_PARAM_NAME.CLOUD_IP, value: cloudIp });
+  }
+  if (localOverride !== undefined && localOverride !== null) {
+    params.push({ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: localOverride });
+  }
   if (protocolVersion) {
     params.push({ name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: protocolVersion });
   }
+  if (productId) {
+    params.push({ name: DEVICE_PARAM_NAME.PRODUCT_ID, value: productId });
+  }
+  if (productKey) {
+    params.push({ name: DEVICE_PARAM_NAME.PRODUCT_KEY, value: productKey });
+  }
   logger.debug(`Tuya convert device specifications"`);
   logger.debug(JSON.stringify(tuyaDevice));
 
@@ -53,7 +70,10 @@ function convertDevice(tuyaDevice) {
     groups[code] = { ...func, readOnly: false };
   });
 
-  const features = Object.values(groups).map((group) => convertFeature(group, externalId));
+  const features = Object.values(groups).map((group) => convertFeature(group, externalId, tuyaDevice));
+
+  const support = getSupportForDevice(tuyaDevice);
+  const hasFeatures = features.length > 0;
 
   const device = {
     name,
@@ -61,10 +81,15 @@ function convertDevice(tuyaDevice) {
     external_id: externalId,
     selector: externalId,
     model: productName || model,
+    product_id: productId,
+    product_key: productKey,
     service_id: this.serviceId,
     poll_frequency: DEVICE_POLL_FREQUENCIES.EVERY_30_SECONDS,
     should_poll: true,
     params,
+    tuya_supported: hasFeatures ? support.supported : false,
+    tuya_support_level: hasFeatures ? support.level : 'none',
+    tuya_support_model: support.model,
   };
   if (online !== undefined) {
     device.online = online;
diff --git a/server/services/tuya/lib/device/tuya.convertFeature.js b/server/services/tuya/lib/device/tuya.convertFeature.js
index c882a5653e..31b833c8a2 100644
--- a/server/services/tuya/lib/device/tuya.convertFeature.js
+++ b/server/services/tuya/lib/device/tuya.convertFeature.js
@@ -1,18 +1,21 @@
 const logger = require('../../../../utils/logger');
+const { DEVICE_FEATURE_UNITS } = require('../../../../utils/constants');
 const { mappings } = require('./tuya.deviceMapping');
+const { getMappingForDevice, getDpsMappingForDevice } = require('../models');
 
 /**
  * @description Transforms Tuya feature as Gladys feature.
  * @param {object} tuyaFunctions - Functions from Tuya.
  * @param {string} externalId - Gladys external ID.
+ * @param {object} device - Tuya device object.
  * @returns {object} Gladys feature or undefined.
  * @example
- * convertFeature({ code: 'switch', type: 'Boolean', values: '{}' }, 'tuya:device_id');
+ * convertFeature({ code: 'switch', type: 'Boolean', values: '{}' }, 'tuya:device_id', { category: 'cz' });
  */
-function convertFeature(tuyaFunctions, externalId) {
+function convertFeature(tuyaFunctions, externalId, device) {
   const { code, values, name, readOnly } = tuyaFunctions;
 
-  const featuresCategoryAndType = mappings[code];
+  const featuresCategoryAndType = getMappingForDevice(device, code) || mappings[code];
   if (!featuresCategoryAndType) {
     logger.warn(`Tuya function with "${code}" code is not managed`);
     return undefined;
@@ -37,12 +40,43 @@ function convertFeature(tuyaFunctions, externalId) {
     max: 1,
     ...featuresCategoryAndType,
   };
+
+  // Apply advanced DPS mapping if available for this code (min/max/unit/scale)
+  const dpsMapping = getDpsMappingForDevice(device);
+  if (dpsMapping && Array.isArray(dpsMapping.dps)) {
+    const dpsEntry = dpsMapping.dps.find((entry) => entry.code === code);
+    if (dpsEntry) {
+      if (dpsEntry.label) {
+        feature.name = dpsEntry.label;
+      }
+      if (typeof dpsEntry.step === 'number') {
+        feature.step = dpsEntry.step;
+      } else if (typeof dpsEntry.scale === 'number' && dpsEntry.scale > 0) {
+        feature.step = dpsEntry.scale;
+      }
+      if (typeof dpsEntry.min === 'number') {
+        feature.min = dpsEntry.min;
+      }
+      if (typeof dpsEntry.max === 'number') {
+        feature.max = dpsEntry.max;
+      }
+      if (dpsEntry.unit === 'c') {
+        feature.unit = DEVICE_FEATURE_UNITS.CELSIUS;
+      }
+      if (dpsEntry.unit === 'f') {
+        feature.unit = DEVICE_FEATURE_UNITS.FAHRENHEIT;
+      }
+    }
+  }
   if ('min' in valuesObject) {
     feature.min = valuesObject.min;
   }
   if ('max' in valuesObject) {
     feature.max = valuesObject.max;
   }
+  if ('step' in valuesObject) {
+    feature.step = valuesObject.step;
+  }
 
   return feature;
 }
diff --git a/server/services/tuya/lib/device/tuya.deviceMapping.js b/server/services/tuya/lib/device/tuya.deviceMapping.js
index 09ea472700..712f0a3be0 100644
--- a/server/services/tuya/lib/device/tuya.deviceMapping.js
+++ b/server/services/tuya/lib/device/tuya.deviceMapping.js
@@ -3,6 +3,7 @@ const {
   DEVICE_FEATURE_CATEGORIES,
   DEVICE_FEATURE_UNITS,
   COVER_STATE,
+  AC_MODE,
 } = require('../../../../utils/constants');
 
 const { intToRgb, rgbToHsb, rgbToInt, hsbToRgb } = require('../../../../utils/colors');
@@ -100,6 +101,45 @@ const mappings = {
 };
 
 const writeValues = {
+  [DEVICE_FEATURE_CATEGORIES.AIR_CONDITIONING]: {
+    [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.BINARY]: (valueFromGladys) => {
+      return valueFromGladys === 1;
+    },
+    [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE]: (valueFromGladys) => {
+      if (valueFromGladys === AC_MODE.AUTO) {
+        return 'auto';
+      }
+      if (valueFromGladys === AC_MODE.COOLING) {
+        return 'cool';
+      }
+      if (valueFromGladys === AC_MODE.HEATING) {
+        return 'heat';
+      }
+      if (valueFromGladys === AC_MODE.DRYING) {
+        return 'dry';
+      }
+      if (valueFromGladys === AC_MODE.FAN) {
+        return 'fan_only';
+      }
+      return valueFromGladys;
+    },
+    [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE]: (valueFromGladys) => {
+      const parsed = parseFloat(valueFromGladys);
+      if (Number.isNaN(parsed)) {
+        return valueFromGladys;
+      }
+      // Tuya AC typically expects temperature * 10 for Celsius.
+      if (parsed > 0 && parsed < 60) {
+        return Math.round(parsed * 10);
+      }
+      return parsed;
+    },
+  },
+  [DEVICE_FEATURE_CATEGORIES.TEXT]: {
+    [DEVICE_FEATURE_TYPES.TEXT.TEXT]: (valueFromGladys) => {
+      return valueFromGladys;
+    },
+  },
   [DEVICE_FEATURE_CATEGORIES.LIGHT]: {
     [DEVICE_FEATURE_TYPES.LIGHT.BINARY]: (valueFromGladys) => {
       return valueFromGladys === 1;
@@ -144,6 +184,56 @@ const writeValues = {
 };
 
 const readValues = {
+  [DEVICE_FEATURE_CATEGORIES.AIR_CONDITIONING]: {
+    [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.BINARY]: (valueFromDevice) => {
+      return valueFromDevice === true ? 1 : 0;
+    },
+    [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE]: (valueFromDevice) => {
+      if (valueFromDevice === 'auto') {
+        return AC_MODE.AUTO;
+      }
+      if (valueFromDevice === 'cool' || valueFromDevice === 'cold' || valueFromDevice === 'cooling') {
+        return AC_MODE.COOLING;
+      }
+      if (valueFromDevice === 'heat' || valueFromDevice === 'heating' || valueFromDevice === 'hot') {
+        return AC_MODE.HEATING;
+      }
+      if (valueFromDevice === 'dry' || valueFromDevice === 'wet' || valueFromDevice === 'drying') {
+        return AC_MODE.DRYING;
+      }
+      if (valueFromDevice === 'fan' || valueFromDevice === 'fan_only') {
+        return AC_MODE.FAN;
+      }
+      return valueFromDevice;
+    },
+    [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE]: (valueFromDevice) => {
+      const parsed = typeof valueFromDevice === 'number' ? valueFromDevice : parseFloat(valueFromDevice);
+      if (Number.isNaN(parsed)) {
+        return valueFromDevice;
+      }
+      if (parsed >= 100) {
+        return parsed / 10;
+      }
+      return parsed;
+    },
+  },
+  [DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR]: {
+    [DEVICE_FEATURE_TYPES.SENSOR.DECIMAL]: (valueFromDevice) => {
+      const parsed = typeof valueFromDevice === 'number' ? valueFromDevice : parseFloat(valueFromDevice);
+      if (Number.isNaN(parsed)) {
+        return valueFromDevice;
+      }
+      if (parsed >= 100) {
+        return parsed / 10;
+      }
+      return parsed;
+    },
+  },
+  [DEVICE_FEATURE_CATEGORIES.TEXT]: {
+    [DEVICE_FEATURE_TYPES.TEXT.TEXT]: (valueFromDevice) => {
+      return valueFromDevice;
+    },
+  },
   [DEVICE_FEATURE_CATEGORIES.LIGHT]: {
     [DEVICE_FEATURE_TYPES.LIGHT.BINARY]: (valueFromDevice) => {
       return valueFromDevice === true ? 1 : 0;
diff --git a/server/services/tuya/lib/dps/air_conditioner.mapping.js b/server/services/tuya/lib/dps/air_conditioner.mapping.js
new file mode 100644
index 0000000000..44defb7dcf
--- /dev/null
+++ b/server/services/tuya/lib/dps/air_conditioner.mapping.js
@@ -0,0 +1,84 @@
+const dps = [
+  {
+    id: 1,
+    code: 'switch',
+    type: 'boolean',
+    label: 'Marche / Arrêt',
+  },
+  {
+    id: 2,
+    code: 'temp_set',
+    type: 'integer',
+    label: 'Température de consigne',
+    min: 16,
+    max: 32,
+    step: 1,
+    scale: 0.1,
+    raw: {
+      min: 160,
+      max: 320,
+      step: 10,
+    },
+    unit: 'c',
+  },
+  {
+    id: 3,
+    code: 'temp_current',
+    type: 'integer',
+    label: 'Température actuelle',
+    min: 0,
+    max: 60,
+    scale: 0.1,
+    raw: {
+      min: 0,
+      max: 600,
+      step: 1,
+    },
+    unit: 'c',
+  },
+  {
+    id: 4,
+    code: 'mode',
+    type: 'string',
+    label: 'Mode',
+    map: {
+      auto: 'auto',
+      cold: 'cool',
+      wet: 'dry',
+      heat: 'heat',
+      fan: 'fan_only',
+    },
+  },
+  {
+    id: 5,
+    code: 'fan_speed_enum',
+    type: 'string',
+    label: 'Vitesse ventilateur',
+    map: {
+      auto: 'auto',
+      low: 'low',
+      low_mid: 'low_mid',
+      mid: 'mid',
+      mid_high: 'mid_high',
+      high: 'high',
+      mute: 'mute',
+      turbo: 'turbo',
+    },
+  },
+  { id: 8, code: 'eco', type: 'boolean', label: 'Éco' },
+  { id: 9, code: 'drying', type: 'boolean', label: 'Déshumidification' },
+  { id: 12, code: 'heat', type: 'boolean', label: 'Chauffage auxiliaire' },
+  { id: 13, code: 'light', type: 'boolean', label: 'Lumière' },
+  { id: 15, code: 'sleep', type: 'boolean', label: 'Mode nuit' },
+  { id: 20, code: 'countdown_left', type: 'integer', label: 'Minuteur (restant)' },
+  { id: 22, code: 'countdown', type: 'integer', label: 'Minuteur' },
+  { id: 105, code: 'temp_unit_convert', type: 'string', label: 'Unité température', map: { c: 'c', f: 'f' } },
+  { id: 110, code: 'health', type: 'boolean', label: 'Santé' },
+  { id: 111, code: 'cleaning', type: 'boolean', label: 'Auto-nettoyage' },
+  { id: 112, code: 'hvac_action', type: 'string', label: 'Action HVAC' },
+];
+
+module.exports = {
+  name: 'air_conditioner_mapping',
+  dps,
+};
diff --git a/server/services/tuya/lib/dps/air_conditioner.standard.js b/server/services/tuya/lib/dps/air_conditioner.standard.js
new file mode 100644
index 0000000000..fd453d63b4
--- /dev/null
+++ b/server/services/tuya/lib/dps/air_conditioner.standard.js
@@ -0,0 +1,86 @@
+const {
+  DEVICE_FEATURE_CATEGORIES,
+  DEVICE_FEATURE_TYPES,
+  DEVICE_FEATURE_UNITS,
+} = require('../../../../utils/constants');
+
+const mappings = {
+  switch: {
+    category: DEVICE_FEATURE_CATEGORIES.AIR_CONDITIONING,
+    type: DEVICE_FEATURE_TYPES.AIR_CONDITIONING.BINARY,
+  },
+  mode: {
+    category: DEVICE_FEATURE_CATEGORIES.AIR_CONDITIONING,
+    type: DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE,
+  },
+  temp_set: {
+    category: DEVICE_FEATURE_CATEGORIES.AIR_CONDITIONING,
+    type: DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE,
+    unit: DEVICE_FEATURE_UNITS.CELSIUS,
+  },
+  temp_current: {
+    category: DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR,
+    type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
+    unit: DEVICE_FEATURE_UNITS.CELSIUS,
+  },
+  fan_speed_enum: {
+    category: DEVICE_FEATURE_CATEGORIES.TEXT,
+    type: DEVICE_FEATURE_TYPES.TEXT.TEXT,
+  },
+  windspeed: {
+    category: DEVICE_FEATURE_CATEGORIES.TEXT,
+    type: DEVICE_FEATURE_TYPES.TEXT.TEXT,
+  },
+  eco: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  heat: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  light: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  sleep: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  drying: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  cleaning: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  health: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  child_lock: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  turbo: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  swing: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  swing_vertical: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  swing_horizontal: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+};
+
+module.exports = {
+  mappings,
+};
diff --git a/server/services/tuya/lib/index.js b/server/services/tuya/lib/index.js
index 873b7900b4..d1dd7a9942 100644
--- a/server/services/tuya/lib/index.js
+++ b/server/services/tuya/lib/index.js
@@ -12,6 +12,7 @@ const { loadDeviceDetails } = require('./tuya.loadDeviceDetails');
 const { setValue } = require('./tuya.setValue');
 const { poll } = require('./tuya.poll');
 const { localScan } = require('./tuya.localScan');
+const { localPoll } = require('./tuya.localPoll');
 
 const { STATUS } = require('./utils/tuya.constants');
 
@@ -38,5 +39,6 @@ TuyaHandler.prototype.loadDeviceDetails = loadDeviceDetails;
 TuyaHandler.prototype.setValue = setValue;
 TuyaHandler.prototype.poll = poll;
 TuyaHandler.prototype.localScan = localScan;
+TuyaHandler.prototype.localPoll = localPoll;
 
 module.exports = TuyaHandler;
diff --git a/server/services/tuya/lib/models/air_conditioner.js b/server/services/tuya/lib/models/air_conditioner.js
new file mode 100644
index 0000000000..698fa42b70
--- /dev/null
+++ b/server/services/tuya/lib/models/air_conditioner.js
@@ -0,0 +1,20 @@
+const { mappings } = require('../dps/air_conditioner.standard');
+const dpsMapping = require('../dps/air_conditioner.mapping');
+
+const NAME = 'air_conditioner';
+const CATEGORY = 'kt';
+const PRODUCT_IDS = [];
+const PRODUCT_KEYS = [];
+const ALLOW_CATEGORY_FALLBACK = true;
+const SUPPORTED_CODES = ['switch', 'mode', 'temp_set', 'temp_current'];
+
+module.exports = {
+  NAME,
+  CATEGORY,
+  PRODUCT_IDS,
+  PRODUCT_KEYS,
+  ALLOW_CATEGORY_FALLBACK,
+  SUPPORTED_CODES,
+  mappings,
+  dpsMapping,
+};
diff --git a/server/services/tuya/lib/models/airton_air_conditioner.js b/server/services/tuya/lib/models/airton_air_conditioner.js
new file mode 100644
index 0000000000..7a4be25524
--- /dev/null
+++ b/server/services/tuya/lib/models/airton_air_conditioner.js
@@ -0,0 +1,35 @@
+const { mappings } = require('../dps/air_conditioner.standard');
+const dpsMapping = require('../dps/air_conditioner.mapping');
+
+const NAME = 'airton_air_conditioner';
+const CATEGORY = 'kt';
+const PRODUCT_IDS = ['f3goccgfj6qino4c'];
+const PRODUCT_KEYS = ['keyquxnsj75xc8se'];
+const ALLOW_CATEGORY_FALLBACK = false;
+const SUPPORTED_CODES = [
+  'switch',
+  'mode',
+  'temp_set',
+  'temp_current',
+  'fan_speed_enum',
+  'eco',
+  'drying',
+  'heat',
+  'light',
+  'sleep',
+  'countdown_left',
+  'temp_unit_convert',
+  'health',
+  'cleaning',
+];
+
+module.exports = {
+  NAME,
+  CATEGORY,
+  PRODUCT_IDS,
+  PRODUCT_KEYS,
+  ALLOW_CATEGORY_FALLBACK,
+  SUPPORTED_CODES,
+  mappings,
+  dpsMapping,
+};
diff --git a/server/services/tuya/lib/models/index.js b/server/services/tuya/lib/models/index.js
new file mode 100644
index 0000000000..983defaf2d
--- /dev/null
+++ b/server/services/tuya/lib/models/index.js
@@ -0,0 +1,83 @@
+const airtonAirConditioner = require('./airton_air_conditioner');
+const airConditioner = require('./air_conditioner');
+const switchModel = require('./switch');
+const thermostat = require('./thermostat');
+const powerMeter = require('./power_meter');
+
+const normalizeCategoryList = (category) => (Array.isArray(category) ? category : [category]);
+const normalizeProductList = (productIds) => (Array.isArray(productIds) ? productIds : [productIds]);
+
+const models = [airtonAirConditioner, airConditioner, switchModel, thermostat, powerMeter];
+
+const categoryToModel = models.reduce((acc, model) => {
+  normalizeCategoryList(model.CATEGORY).forEach((category) => {
+    acc[category] = model;
+  });
+  return acc;
+}, {});
+
+const productToModel = models.reduce((acc, model) => {
+  normalizeProductList(model.PRODUCT_IDS || []).forEach((productId) => {
+    acc[productId] = model;
+  });
+  normalizeProductList(model.PRODUCT_KEYS || []).forEach((productKey) => {
+    acc[productKey] = model;
+  });
+  return acc;
+}, {});
+
+const getModelForDevice = (device) => {
+  if (!device) {
+    return null;
+  }
+  return productToModel[device.product_key] || productToModel[device.product_id] || categoryToModel[device.category];
+};
+
+const getMappingForDevice = (device, code) => {
+  if (!device || !code) {
+    return null;
+  }
+  const model = getModelForDevice(device);
+  if (!model || !model.mappings) {
+    return null;
+  }
+  if (Array.isArray(model.SUPPORTED_CODES) && !model.SUPPORTED_CODES.includes(code)) {
+    return null;
+  }
+  return model.mappings[code] || null;
+};
+
+const getDpsMappingForDevice = (device) => {
+  const model = getModelForDevice(device);
+  if (!model || !model.dpsMapping || !model.dpsMapping.dps) {
+    return null;
+  }
+  const filtered = Array.isArray(model.SUPPORTED_CODES)
+    ? model.dpsMapping.dps.filter((entry) => model.SUPPORTED_CODES.includes(entry.code))
+    : model.dpsMapping.dps;
+  return {
+    name: model.dpsMapping.name,
+    dps: filtered,
+  };
+};
+
+const getSupportForDevice = (device) => {
+  if (!device) {
+    return { supported: false, level: 'none', model: null };
+  }
+  const modelByProduct = productToModel[device.product_key] || productToModel[device.product_id];
+  if (modelByProduct) {
+    return { supported: true, level: 'product', model: modelByProduct.NAME || null };
+  }
+  const modelByCategory = categoryToModel[device.category];
+  if (modelByCategory && modelByCategory.ALLOW_CATEGORY_FALLBACK) {
+    return { supported: true, level: 'category', model: modelByCategory.NAME || null };
+  }
+  return { supported: false, level: 'none', model: modelByCategory ? modelByCategory.NAME || null : null };
+};
+
+module.exports = {
+  getMappingForDevice,
+  getDpsMappingForDevice,
+  getSupportForDevice,
+};
diff --git a/server/services/tuya/lib/models/power_meter.js b/server/services/tuya/lib/models/power_meter.js
new file mode 100644
index 0000000000..c855f10701
--- /dev/null
+++ b/server/services/tuya/lib/models/power_meter.js
@@ -0,0 +1,35 @@
+const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES, DEVICE_FEATURE_UNITS } = require('../../../../utils/constants');
+
+const NAME = 'power_meter';
+const CATEGORY = 'zndb';
+const ALLOW_CATEGORY_FALLBACK = true;
+
+const mappings = {
+  cur_power: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.POWER,
+    unit: DEVICE_FEATURE_UNITS.WATT,
+  },
+  cur_voltage: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.VOLTAGE,
+    unit: DEVICE_FEATURE_UNITS.VOLT,
+  },
+  cur_current: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.CURRENT,
+    unit: DEVICE_FEATURE_UNITS.MILLI_AMPERE,
+  },
+  add_ele: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.ENERGY,
+    unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
+  },
+};
+
+module.exports = {
+  NAME,
+  CATEGORY,
+  ALLOW_CATEGORY_FALLBACK,
+  mappings,
+};
diff --git a/server/services/tuya/lib/models/switch.js b/server/services/tuya/lib/models/switch.js
new file mode 100644
index 0000000000..b3753c8ff5
--- /dev/null
+++ b/server/services/tuya/lib/models/switch.js
@@ -0,0 +1,37 @@
+const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../../utils/constants');
+
+const NAME = 'switch';
+const CATEGORY = ['cz', 'kg'];
+const PRODUCT_IDS = ['keyaqceqmgp343e7', 'cya3zxfd38g4qp8d'];
+const ALLOW_CATEGORY_FALLBACK = true;
+
+const mappings = {
+  switch: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  switch_1: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  switch_2: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  switch_3: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  switch_4: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+};
+
+module.exports = {
+  NAME,
+  CATEGORY,
+  PRODUCT_IDS,
+  ALLOW_CATEGORY_FALLBACK,
+  mappings,
+};
diff --git a/server/services/tuya/lib/models/thermostat.js b/server/services/tuya/lib/models/thermostat.js
new file mode 100644
index 0000000000..f61289d3dd
--- /dev/null
+++ b/server/services/tuya/lib/models/thermostat.js
@@ -0,0 +1,35 @@
+const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES, DEVICE_FEATURE_UNITS } = require('../../../../utils/constants');
+
+const NAME = 'thermostat';
+const CATEGORY = 'cjkg';
+const PRODUCT_IDS = ['c03zek9b5daz7omr'];
+const ALLOW_CATEGORY_FALLBACK = false;
+
+const mappings = {
+  temp_set: {
+    category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
+    type: DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE,
+    unit: DEVICE_FEATURE_UNITS.CELSIUS,
+  },
+  temp_current: {
+    category: DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR,
+    type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
+    unit: DEVICE_FEATURE_UNITS.CELSIUS,
+  },
+  switch: {
+    category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
+    type: DEVICE_FEATURE_TYPES.AIR_CONDITIONING.BINARY,
+  },
+  mode: {
+    category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
+    type: DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE,
+  },
+};
+
+module.exports = {
+  NAME,
+  CATEGORY,
+  PRODUCT_IDS,
+  ALLOW_CATEGORY_FALLBACK,
+  mappings,
+};
diff --git a/server/services/tuya/lib/tuya.discoverDevices.js b/server/services/tuya/lib/tuya.discoverDevices.js
index a8421c85c8..5cf9b3b20c 100644
--- a/server/services/tuya/lib/tuya.discoverDevices.js
+++ b/server/services/tuya/lib/tuya.discoverDevices.js
@@ -31,13 +31,7 @@ async function discoverDevices() {
   });
 
   let devices = [];
-  let localDevicesById = {};
-  try {
-    localDevicesById = await this.localScan();
-    logger.debug(`[Tuya] Local UDP scan returned ${Object.keys(localDevicesById).length} device(s)`);
-  } catch (e) {
-    logger.debug('[Tuya] Local UDP scan failed', e);
-  }
+  const localDevicesById = {};
 
   try {
     devices = await this.loadDevices();
@@ -51,15 +45,12 @@ async function discoverDevices() {
   ).then((results) => results.filter((result) => result.status === 'fulfilled').map((result) => result.value));
 
   this.discoveredDevices = this.discoveredDevices.map((device) => {
-    const localInfo = localDevicesById[device.id];
-    if (localInfo) {
-      return {
-        ...device,
-        protocol_version: localInfo.version,
-        ip: device.ip || localInfo.ip,
-      };
-    }
-    return device;
+    const cloudIp = device.cloud_ip || device.ip;
+    return {
+      ...device,
+      cloud_ip: cloudIp,
+      local_override: false,
+    };
   });
 
   this.discoveredDevices = this.discoveredDevices
diff --git a/server/services/tuya/lib/tuya.localPoll.js b/server/services/tuya/lib/tuya.localPoll.js
new file mode 100644
index 0000000000..31b5a2a1db
--- /dev/null
+++ b/server/services/tuya/lib/tuya.localPoll.js
@@ -0,0 +1,77 @@
+const logger = require('../../../utils/logger');
+const TuyAPI = require('tuyapi');
+const { BadParameters } = require('../../../utils/coreErrors');
+
+/**
+ * @description Poll a Tuya device locally to retrieve DPS map.
+ * @param {object} payload - Local connection info.
+ * @returns {Promise<object>} DPS map.
+ */
+async function localPoll(payload) {
+  const { deviceId, ip, localKey, protocolVersion, timeoutMs = 8000 } = payload || {};
+  const effectiveTimeout = protocolVersion === '3.5' ? Math.max(timeoutMs, 15000) : timeoutMs;
+
+  if (!deviceId || !ip || !localKey || !protocolVersion) {
+    throw new BadParameters('Missing local connection parameters');
+  }
+
+  const tuyaLocal = new TuyAPI({
+    id: deviceId,
+    key: localKey,
+    ip,
+    version: protocolVersion,
+  });
+
+  const runGet = async (options) => {
+    const operation = (async () => {
+      await tuyaLocal.connect();
+      const data = await tuyaLocal.get(options);
+      return data;
+    })();
+    const data = await Promise.race([
+      operation,
+      new Promise((_, reject) =>
+        setTimeout(() => reject(new BadParameters('Local poll timeout')), effectiveTimeout),
+      ),
+    ]);
+    await tuyaLocal.disconnect();
+    return data;
+  };
+
+  try {
+    const attempts =
+      protocolVersion === '3.5'
+        ? [{ schema: true }, { schema: true, dps: [1] }, {}]
+        : [{ schema: true }];
+    let data = null;
+    for (let i = 0; i < attempts.length; i += 1) {
+      try {
+        data = await runGet(attempts[i]);
+        break;
+      } catch (e) {
+        if (i === attempts.length - 1) {
+          throw e;
+        }
+      }
+    }
+    if (!data || typeof data !== 'object' || !data.dps) {
+      const errorMessage =
+        typeof data === 'string' ? `Invalid local poll response: ${data}` : 'Invalid local poll response';
+      throw new BadParameters(errorMessage);
+    }
+    logger.debug(`[Tuya][localPoll] device=${deviceId} dps=${JSON.stringify(data)}`);
+    return data;
+  } catch (e) {
+    logger.warn(`[Tuya][localPoll] failed for device=${deviceId}`, e);
+    try {
+      await tuyaLocal.disconnect();
+    } catch (err) {
+      // ignore
+    }
+    throw e;
+  }
+}
+
+module.exports = {
+  localPoll,
+};
diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index a3d084201e..951bef8084 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -1,5 +1,6 @@
 const { BadParameters } = require('../../../utils/coreErrors');
 const { readValues } = require('./device/tuya.deviceMapping');
+const { getDpsMappingForDevice } = require('./models');
 const { API } = require('./utils/tuya.constants');
 const { EVENTS } = require('../../../utils/constants');
 
@@ -28,18 +29,78 @@ async function poll(device) {
   });
 
   const values = {};
+  const sources = {};
   (response.result || []).forEach((feature) => {
     values[feature.code] = feature.value;
+    sources[feature.code] = 'cloud';
   });
 
+  // Optionally map local DPS values to codes if we have a mapping and local DPS stored.
+  const dpsMapping = getDpsMappingForDevice(device);
+  const dpsParam =
+    Array.isArray(device.params) && device.params.find((param) => param.name === 'TUYA_DP_MAP');
+  const localOverrideParam =
+    Array.isArray(device.params) && device.params.find((param) => param.name === 'LOCAL_OVERRIDE');
+  const localOverride = localOverrideParam ? localOverrideParam.value === true || localOverrideParam.value === 'true' : false;
+
+  if (dpsMapping && dpsParam && typeof dpsParam.value === 'string' && localOverride) {
+    try {
+      const parsed = JSON.parse(dpsParam.value);
+      if (parsed && parsed.dps) {
+        dpsMapping.dps.forEach((entry) => {
+          const rawValue = parsed.dps[entry.id];
+          if (rawValue !== undefined) {
+            values[entry.code] = rawValue;
+            sources[entry.code] = 'local';
+          }
+        });
+      }
+    } catch (e) {
+      // ignore invalid mapping payload
+    }
+  }
+
+  // Normalize values using DPS mapping (applies to both cloud and local values)
+  if (dpsMapping && Array.isArray(dpsMapping.dps)) {
+    dpsMapping.dps.forEach((entry) => {
+      if (values[entry.code] === undefined) {
+        return;
+      }
+      let mappedValue = values[entry.code];
+      if (entry.map && typeof entry.map === 'object' && entry.map[mappedValue] !== undefined) {
+        mappedValue = entry.map[mappedValue];
+      }
+      if (entry.scale) {
+        const numeric = typeof mappedValue === 'number' ? mappedValue : parseFloat(mappedValue);
+        if (!Number.isNaN(numeric)) {
+          mappedValue = numeric * entry.scale;
+        }
+      }
+      values[entry.code] = mappedValue;
+    });
+  }
+
   device.features.forEach((deviceFeature) => {
     const [, , code] = deviceFeature.external_id.split(':');
 
     const value = values[code];
-    const transformedValue = readValues[deviceFeature.category][deviceFeature.type](value);
+    const categoryMapping = readValues[deviceFeature.category];
+    if (!categoryMapping || !categoryMapping[deviceFeature.type]) {
+      if (this.logger && this.logger.debug) {
+        this.logger.debug(
+          `[Tuya][poll] Skip feature "${deviceFeature.external_id}" - no mapping for ${deviceFeature.category}/${deviceFeature.type}`
+        );
+      }
+      return;
+    }
+    const transformedValue = categoryMapping[deviceFeature.type](value);
 
     if (deviceFeature.last_value !== transformedValue) {
       if (transformedValue !== null && transformedValue !== undefined) {
+        const source = sources[code] || 'cloud';
+        this.logger && this.logger.debug && this.logger.debug(
+          `[Tuya][poll] ${device.external_id}:${code} value=${transformedValue} source=${source}`
+        );
         this.gladys.event.emit(EVENTS.DEVICE.NEW_STATE, {
           device_feature_external_id: deviceFeature.external_id,
           state: transformedValue,
diff --git a/server/services/tuya/lib/tuya.setValue.js b/server/services/tuya/lib/tuya.setValue.js
index b2d6083e7a..57c18e0064 100644
--- a/server/services/tuya/lib/tuya.setValue.js
+++ b/server/services/tuya/lib/tuya.setValue.js
@@ -2,6 +2,75 @@ const logger = require('../../../utils/logger');
 const { API } = require('./utils/tuya.constants');
 const { BadParameters } = require('../../../utils/coreErrors');
 const { writeValues } = require('./device/tuya.deviceMapping');
+const { DEVICE_PARAM_NAME } = require('./utils/tuya.constants');
+const { getDpsMappingForDevice } = require('./models');
+const TuyAPI = require('tuyapi');
+
+const getParamValue = (params, name) => {
+  const found = (params || []).find((param) => param.name === name);
+  return found ? found.value : undefined;
+};
+
+const normalizeBoolean = (value) => {
+  if (value === true || value === 'true') {
+    return true;
+  }
+  if (value === false || value === 'false') {
+    return false;
+  }
+  return undefined;
+};
+
+const getLocalDpsFromCode = (code) => {
+  if (!code) {
+    return null;
+  }
+  if (code === 'switch') {
+    return 1;
+  }
+  const match = code.match(/_(\\d+)$/);
+  if (match) {
+    return parseInt(match[1], 10);
+  }
+  return null;
+};
+
+const findDpsEntry = (dpsMapping, code) => {
+  if (!dpsMapping || !Array.isArray(dpsMapping.dps)) {
+    return null;
+  }
+  return dpsMapping.dps.find((entry) => entry.code === code) || null;
+};
+
+const mapValueForDps = (entry, value) => {
+  let mappedValue = value;
+  if (entry.map && typeof entry.map === 'object') {
+    const inverse = Object.keys(entry.map).reduce((acc, key) => {
+      acc[entry.map[key]] = key;
+      return acc;
+    }, {});
+    if (inverse[mappedValue] !== undefined) {
+      mappedValue = inverse[mappedValue];
+    }
+  }
+  if (entry.type === 'integer' && typeof mappedValue === 'string') {
+    const parsed = parseFloat(mappedValue);
+    if (!Number.isNaN(parsed)) {
+      mappedValue = parsed;
+    }
+  }
+  if (entry.scale && typeof mappedValue === 'number') {
+    mappedValue = Math.round(mappedValue / entry.scale);
+    if (entry.raw && typeof entry.raw.step === 'number') {
+      const step = entry.raw.step;
+      mappedValue = Math.round(mappedValue / step) * step;
+    }
+  }
+  if (entry.type === 'boolean' && typeof mappedValue === 'number') {
+    mappedValue = mappedValue === 1;
+  }
+  return mappedValue;
+};
 
 /**
  * @description Send the new device value over device protocol.
@@ -22,9 +91,44 @@ async function setValue(device, deviceFeature, value) {
     throw new BadParameters(`Tuya device external_id is invalid: "${externalId}" have no network indicator`);
   }
 
-  const transformedValue = writeValues[deviceFeature.category][deviceFeature.type](value);
+  const writeCategory = writeValues[deviceFeature.category];
+  const writeFn = writeCategory ? writeCategory[deviceFeature.type] : null;
+  const transformedValue = writeFn ? writeFn(value) : value;
   logger.debug(`Change value for devices ${topic}/${command} to value ${transformedValue}...`);
 
+  const params = device.params || [];
+  const dpsMapping = getDpsMappingForDevice(device);
+  const dpsEntry = findDpsEntry(dpsMapping, command);
+  const mappedValue = dpsEntry ? mapValueForDps(dpsEntry, transformedValue) : transformedValue;
+  const ipAddress = getParamValue(params, DEVICE_PARAM_NAME.IP_ADDRESS);
+  const localKey = getParamValue(params, DEVICE_PARAM_NAME.LOCAL_KEY);
+  const protocolVersion = getParamValue(params, DEVICE_PARAM_NAME.PROTOCOL_VERSION);
+  const cloudIp = getParamValue(params, DEVICE_PARAM_NAME.CLOUD_IP);
+  const localOverride = normalizeBoolean(getParamValue(params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE));
+
+  const hasLocalConfig =
+    ipAddress && localKey && protocolVersion && (localOverride === true || (cloudIp && ipAddress !== cloudIp));
+
+  const localDps = dpsEntry ? dpsEntry.id : getLocalDpsFromCode(command);
+
+  if (hasLocalConfig && localDps !== null) {
+    try {
+      const tuyaLocal = new TuyAPI({
+        id: topic,
+        key: localKey,
+        ip: ipAddress,
+        version: protocolVersion,
+      });
+      await tuyaLocal.connect();
+      await tuyaLocal.set({ dps: localDps, set: mappedValue });
+      await tuyaLocal.disconnect();
+      logger.debug(`[Tuya][setValue][local] device=${topic} dps=${localDps} value=${mappedValue}`);
+      return;
+    } catch (e) {
+      logger.warn(`[Tuya][setValue][local] failed, fallback to cloud`, e);
+    }
+  }
+
   const response = await this.connector.request({
     method: 'POST',
     path: `${API.VERSION_1_0}/devices/${topic}/commands`,
@@ -32,7 +136,7 @@ async function setValue(device, deviceFeature, value) {
       commands: [
         {
           code: command,
-          value: transformedValue,
+          value: mappedValue,
         },
       ],
     },
diff --git a/server/services/tuya/lib/utils/tuya.constants.js b/server/services/tuya/lib/utils/tuya.constants.js
index 62a6a8f53f..2463f70b80 100644
--- a/server/services/tuya/lib/utils/tuya.constants.js
+++ b/server/services/tuya/lib/utils/tuya.constants.js
@@ -38,6 +38,11 @@ const DEVICE_PARAM_NAME = {
   LOCAL_KEY: 'LOCAL_KEY',
   IP_ADDRESS: 'IP_ADDRESS',
   PROTOCOL_VERSION: 'PROTOCOL_VERSION',
+  CLOUD_IP: 'CLOUD_IP',
+  LOCAL_OVERRIDE: 'LOCAL_OVERRIDE',
+  DP_MAP: 'TUYA_DP_MAP',
+  PRODUCT_ID: 'PRODUCT_ID',
+  PRODUCT_KEY: 'PRODUCT_KEY',
 };
 
 module.exports = {
diff --git a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
index bd39be94ab..61b9df126d 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
@@ -4,7 +4,7 @@ const { convertFeature } = require('../../../../../../services/tuya/lib/device/t
 
 describe('Tuya convert feature', () => {
   it('should return undefined when code not exist', () => {
-    const result = convertFeature({ code: 'NOT_EXIST' }, 'externalId');
+    const result = convertFeature({ code: 'NOT_EXIST' }, 'externalId', { category: 'cz' });
     expect(result).to.eq(undefined);
   });
 
@@ -18,6 +18,7 @@ describe('Tuya convert feature', () => {
         values: '{"min":100,"max":1000}',
       },
       'externalId',
+      { category: 'cz' },
     );
     expect(result).to.deep.eq({
       category: 'switch',
@@ -42,6 +43,7 @@ describe('Tuya convert feature', () => {
         values: '{',
       },
       'externalId',
+      { category: 'cz' },
     );
     expect(result).to.deep.eq({
       category: 'switch',
@@ -55,4 +57,30 @@ describe('Tuya convert feature', () => {
       type: 'binary',
     });
   });
+
+  it('should use air conditioner mapping', () => {
+    const result = convertFeature(
+      {
+        code: 'temp_set',
+        type: 'Integer',
+        name: 'temp',
+        readOnly: false,
+        values: '{"min":160,"max":880,"scale":1,"step":10}',
+      },
+      'externalId',
+      { category: 'kt', product_id: 'keyquxnsj75xc8se' },
+    );
+    expect(result).to.deep.eq({
+      category: 'air-conditioning',
+      external_id: 'externalId:temp_set',
+      has_feedback: false,
+      max: 880,
+      min: 160,
+      name: 'temp',
+      read_only: false,
+      selector: 'externalId:temp_set',
+      type: 'target-temperature',
+      unit: 'celsius',
+    });
+  });
 });

From d9598ca9e3587bbd318f3fbd577a175e43e53b36 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 15 Feb 2026 19:01:34 +0100
Subject: [PATCH 05/90] refactor: remove air conditioning model and related
 mappings; simplify device conversion logic

---
 .../AirConditioningModeDeviceFeature.jsx      |  37 +----
 .../device-features/SetpointDeviceFeature.jsx |   7 +-
 .../device-in-room/device-features/style.css  |  28 ----
 front/src/config/i18n/de.json                 |  11 +-
 front/src/config/i18n/en.json                 |  11 +-
 front/src/config/i18n/fr.json                 |  11 +-
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 146 ++++--------------
 .../tuya/lib/device/tuya.convertDevice.js     |  11 +-
 .../tuya/lib/device/tuya.convertFeature.js    |  40 +----
 .../tuya/lib/device/tuya.deviceMapping.js     |  90 -----------
 .../tuya/lib/dps/air_conditioner.mapping.js   |  84 ----------
 .../tuya/lib/dps/air_conditioner.standard.js  |  86 -----------
 .../tuya/lib/models/air_conditioner.js        |  20 ---
 .../tuya/lib/models/airton_air_conditioner.js |  35 -----
 server/services/tuya/lib/models/index.js      |  83 ----------
 .../services/tuya/lib/models/power_meter.js   |  35 -----
 server/services/tuya/lib/models/switch.js     |  37 -----
 server/services/tuya/lib/models/thermostat.js |  35 -----
 server/services/tuya/lib/tuya.poll.js         |  63 +-------
 server/services/tuya/lib/tuya.setValue.js     |  49 +-----
 .../feature/tuya.convertFeature.test.js       |  30 +---
 21 files changed, 52 insertions(+), 897 deletions(-)
 delete mode 100644 server/services/tuya/lib/dps/air_conditioner.mapping.js
 delete mode 100644 server/services/tuya/lib/dps/air_conditioner.standard.js
 delete mode 100644 server/services/tuya/lib/models/air_conditioner.js
 delete mode 100644 server/services/tuya/lib/models/airton_air_conditioner.js
 delete mode 100644 server/services/tuya/lib/models/index.js
 delete mode 100644 server/services/tuya/lib/models/power_meter.js
 delete mode 100644 server/services/tuya/lib/models/switch.js
 delete mode 100644 server/services/tuya/lib/models/thermostat.js

diff --git a/front/src/components/boxs/device-in-room/device-features/AirConditioningModeDeviceFeature.jsx b/front/src/components/boxs/device-in-room/device-features/AirConditioningModeDeviceFeature.jsx
index f310e828cc..043b53b9f3 100644
--- a/front/src/components/boxs/device-in-room/device-features/AirConditioningModeDeviceFeature.jsx
+++ b/front/src/components/boxs/device-in-room/device-features/AirConditioningModeDeviceFeature.jsx
@@ -3,7 +3,6 @@ import { Text } from 'preact-i18n';
 import cx from 'classnames';
 
 import { DeviceFeatureCategoriesIcon } from '../../../../utils/consts';
-import style from './style.css';
 import { AC_MODE } from '../../../../../../server/utils/constants';
 
 const AirConditioningModeDeviceFeature = ({ children, ...props }) => {
@@ -26,26 +25,18 @@ const AirConditioningModeDeviceFeature = ({ children, ...props }) => {
     updateValue(AC_MODE.HEATING);
   }
 
-  function drying() {
-    updateValue(AC_MODE.DRYING);
-  }
-
-  function fan() {
-    updateValue(AC_MODE.FAN);
-  }
-
   return (
     <tr>
       <td>
         <i class={`fe fe-${get(DeviceFeatureCategoriesIcon, `${category}.${type}`, { default: 'sliders' })}`} />
       </td>
-      <td class={style.airConditioningModeLabel}>{props.rowName}</td>
+      <td>{props.rowName}</td>
 
-      <td class={style.airConditioningModeControls}>
+      <td class="py-0">
         <div class="d-flex justify-content-end">
-          <div class={style.airConditioningModeGroup} role="group">
+          <div class="btn-group" role="group">
             <button
-              class={cx('btn btn-sm btn-secondary', style.airConditioningModeButton, {
+              class={cx('btn btn-sm btn-secondary', {
                 active: lastValue === AC_MODE.AUTO
               })}
               onClick={auto}
@@ -53,7 +44,7 @@ const AirConditioningModeDeviceFeature = ({ children, ...props }) => {
               <Text id={`deviceFeatureAction.category.${category}.${type}.auto`} plural={AC_MODE.HEATING} />
             </button>
             <button
-              class={cx('btn btn-sm btn-secondary', style.airConditioningModeButton, {
+              class={cx('btn btn-sm btn-secondary', {
                 active: lastValue === AC_MODE.COOLING
               })}
               onClick={cooling}
@@ -61,29 +52,13 @@ const AirConditioningModeDeviceFeature = ({ children, ...props }) => {
               <Text id={`deviceFeatureAction.category.${category}.${type}.cooling`} plural={AC_MODE.HEATING} />
             </button>
             <button
-              class={cx('btn btn-sm', 'btn-secondary', style.airConditioningModeButton, {
+              class={cx('btn btn-sm', 'btn-secondary', {
                 active: lastValue === AC_MODE.HEATING
               })}
               onClick={heating}
             >
               <Text id={`deviceFeatureAction.category.${category}.${type}.heating`} plural={AC_MODE.HEATING} />
             </button>
-            <button
-              class={cx('btn btn-sm btn-secondary', style.airConditioningModeButton, {
-                active: lastValue === AC_MODE.DRYING
-              })}
-              onClick={drying}
-            >
-              <Text id={`deviceFeatureAction.category.${category}.${type}.drying`} plural={AC_MODE.DRYING} />
-            </button>
-            <button
-              class={cx('btn btn-sm btn-secondary', style.airConditioningModeButton, {
-                active: lastValue === AC_MODE.FAN
-              })}
-              onClick={fan}
-            >
-              <Text id={`deviceFeatureAction.category.${category}.${type}.fan`} plural={AC_MODE.FAN} />
-            </button>
           </div>
         </div>
       </td>
diff --git a/front/src/components/boxs/device-in-room/device-features/SetpointDeviceFeature.jsx b/front/src/components/boxs/device-in-room/device-features/SetpointDeviceFeature.jsx
index 3d4a1143c2..6fd948ac8c 100644
--- a/front/src/components/boxs/device-in-room/device-features/SetpointDeviceFeature.jsx
+++ b/front/src/components/boxs/device-in-room/device-features/SetpointDeviceFeature.jsx
@@ -24,8 +24,7 @@ const DEFAULT_VALUE_BY_CATEGORY = {
 };
 
 const SetpointDeviceFeature = ({ children, ...props }) => {
-  const featureStep = props.deviceFeature && props.deviceFeature.step;
-  const SETPOINT_STEP = featureStep || SETPOINT_STEP_BY_CATEGORY[props.deviceFeature.category] || 0.5;
+  const SETPOINT_STEP = SETPOINT_STEP_BY_CATEGORY[props.deviceFeature.category] || 0.5;
   const DEFAULT_VALUE_IN_CASE_EMPTY = DEFAULT_VALUE_BY_CATEGORY[props.deviceFeature.category] || 0;
 
   function updateValue(value) {
@@ -74,7 +73,7 @@ const SetpointDeviceFeature = ({ children, ...props }) => {
               </div>
               <input
                 type="number"
-                value={isNullOrUndefined(props.deviceFeature.last_value) ? '' : props.deviceFeature.last_value}
+                value={props.deviceFeature.last_value}
                 class={cx('form-control text-center', style.removeNumberArrow)}
                 onChange={updateValueEvent}
                 step={SETPOINT_STEP}
@@ -97,7 +96,7 @@ const SetpointDeviceFeature = ({ children, ...props }) => {
                 <div>
                   <input
                     type="number"
-                    value={isNullOrUndefined(props.deviceFeature.last_value) ? '' : props.deviceFeature.last_value}
+                    value={props.deviceFeature.last_value}
                     class={cx('form-control text-center input-sm', style.removeNumberArrow)}
                     onChange={updateValueEvent}
                     step={SETPOINT_STEP}
diff --git a/front/src/components/boxs/device-in-room/device-features/style.css b/front/src/components/boxs/device-in-room/device-features/style.css
index 06c2c0eb21..aa35292ba2 100644
--- a/front/src/components/boxs/device-in-room/device-features/style.css
+++ b/front/src/components/boxs/device-in-room/device-features/style.css
@@ -56,31 +56,3 @@ input[type='range'][class~='light-temperature']::-ms-fill-lower {
 .rangeInput {
   flex: 1;
 }
-
-.airConditioningModeGroup {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 0.25rem;
-  justify-content: center;
-  align-content: center;
-  max-width: 16rem;
-  margin-left: auto;
-}
-
-.airConditioningModeButton {
-  flex: 0 0 auto;
-  margin: 0;
-}
-
-.airConditioningModeLabel {
-  max-width: 10rem;
-  white-space: normal;
-  line-height: 1.2;
-}
-
-.airConditioningModeControls {
-  padding-top: 0;
-  padding-bottom: 0;
-  vertical-align: middle;
-  width: 17rem;
-}
diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index d4ffea7336..0a2866e8f1 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1180,16 +1180,11 @@
         "localKeyLabel": "Lokaler Schlüssel",
         "protocolVersionLabel": "Protokollversion",
         "ipAddressLabel": "IP-Adresse",
-        "productIdLabel": "Produkt-ID",
-        "productIdCloudLabel": "Cloud-Produkt-ID:",
         "localInfoHelp": "Gib die lokale IP und die Protokollversion ein, wenn du den lokalen Modus nutzen willst. Die Cloud-IP wird zur Referenz gespeichert.",
         "localPollButton": "Lokales DPS abfragen",
         "localPollSuccess": "Lokaler Poll OK.",
-        "localPollError": "Lokaler Poll fehlgeschlagen:",
-        "createGithubIssue": "Github-Issue erstellen",
-        "dpMapLabel": "Lokale DPS-Ausgabe"
+        "localPollError": "Lokaler Poll fehlgeschlagen:"
       },
-      "unmanagedModelHelp": "Cloud-Modus: du kannst so speichern. Lokaler Modus: lokale IP + Protokoll eintragen und lokalen DPS-Poll starten.",
       "discover": {
         "title": "In deinem Tuya-Cloud-Account erkannte Geräte",
         "description": "Tuya-Geräte werden automatisch erkannt. Deine Tuya-Geräte müssen zuerst zu deinem Tuya-Cloud-Account hinzugefügt werden.",
@@ -3313,9 +3308,7 @@
         "mode": {
           "auto": "Automatisch",
           "cooling": "Kühlen",
-          "heating": "Heizen",
-          "drying": "Trocknen",
-          "fan": "Lüften"
+          "heating": "Heizen"
         }
       },
       "heater": {
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index ab8635cb4c..56d7cc9737 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1075,16 +1075,11 @@
         "localKeyLabel": "Local Key",
         "protocolVersionLabel": "Protocol Version",
         "ipAddressLabel": "IP Address",
-        "productIdLabel": "Product ID",
-        "productIdCloudLabel": "Cloud product ID:",
         "localInfoHelp": "Enter the local IP and protocol version if you want to use local mode. The cloud IP is kept for reference.",
         "localPollButton": "Poll local DPS",
         "localPollSuccess": "Local poll OK.",
-        "localPollError": "Local poll failed:",
-        "createGithubIssue": "Create a Github issue",
-        "dpMapLabel": "Local DPS output"
+        "localPollError": "Local poll failed:"
       },
-      "unmanagedModelHelp": "Cloud mode: you can save as-is. Local mode: enter local IP + protocol then run local DPS poll.",
       "discover": {
         "title": "Devices detected on your Tuya cloud account",
         "description": "Tuya devices are automatically discovered. Your Tuya devices need to be added to your Tuya cloud account before.",
@@ -3313,9 +3308,7 @@
         "mode": {
           "auto": "Auto",
           "cooling": "Cool",
-          "heating": "Heat",
-          "drying": "Dry",
-          "fan": "Fan"
+          "heating": "Heat"
         }
       },
       "heater": {
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index 1c1d435867..ccab1d13a4 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1310,16 +1310,11 @@
         "localKeyLabel": "Clé locale",
         "protocolVersionLabel": "Version du protocole",
         "ipAddressLabel": "Adresse IP",
-        "productIdLabel": "Identifiant produit",
-        "productIdCloudLabel": "Identifiant produit cloud :",
         "localInfoHelp": "Saisissez l'IP locale et la version du protocole si vous souhaitez utiliser le mode local. L'IP cloud est conservée en référence.",
         "localPollButton": "Poll local des DP",
         "localPollSuccess": "Poll local OK.",
-        "localPollError": "Échec du poll local :",
-        "createGithubIssue": "Créer une issue Github",
-        "dpMapLabel": "Sortie DPS locale"
+        "localPollError": "Échec du poll local :"
       },
-      "unmanagedModelHelp": "Mode cloud : vous pouvez sauvegarder tel quel. Mode local : renseignez IP locale + protocole puis lancez le poll local des DP.",
       "discover": {
         "title": "Appareils détectés sur votre compte cloud Tuya",
         "description": "Les appareils Tuya sont automatiquement découverts. Vos appareils Tuya doivent être ajoutés à votre compte cloud Tuya avant.",
@@ -3313,9 +3308,7 @@
         "mode": {
           "auto": "Auto",
           "cooling": "Clim.",
-          "heating": "Chauffage",
-          "drying": "Déshum.",
-          "fan": "Ventilation"
+          "heating": "Chauffage"
         }
       },
       "heater": {
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 6feb922148..9c4c36c8da 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -7,40 +7,6 @@ import DeviceFeatures from '../../../../components/device/view/DeviceFeatures';
 import { connect } from 'unistore/preact';
 import { RequestStatus } from '../../../../utils/consts';
 
-const GITHUB_BASE_URL = 'https://github.com/GladysAssistant/Gladys/issues/new';
-
-const sanitizeDeviceForIssue = device => {
-  if (!device) {
-    return device;
-  }
-  const sanitized = { ...device };
-  const params = Array.isArray(device.params) ? device.params.map(param => ({ ...param })) : [];
-  params.forEach(param => {
-    if (['LOCAL_KEY', 'IP_ADDRESS', 'CLOUD_IP'].includes(param.name)) {
-      param.value = '<redacted>';
-    }
-  });
-  sanitized.params = params;
-  if (sanitized.local_key) {
-    sanitized.local_key = '<redacted>';
-  }
-  if (sanitized.ip) {
-    sanitized.ip = '<redacted>';
-  }
-  if (sanitized.cloud_ip) {
-    sanitized.cloud_ip = '<redacted>';
-  }
-  sanitized.mode = sanitized.local_override ? 'local' : 'cloud';
-  return sanitized;
-};
-
-const createGithubUrl = device => {
-  const title = encodeURIComponent(`Tuya: Unsupported device ${device.product_id || device.model || device.name}`);
-  const sanitized = sanitizeDeviceForIssue(device);
-  const body = encodeURIComponent(`\`\`\`\n${JSON.stringify(sanitized, null, 2)}\n\`\`\``);
-  return `${GITHUB_BASE_URL}?title=${title}&body=${body}`;
-};
-
 class TuyaDeviceBox extends Component {
   componentWillMount() {
     this.setState({
@@ -253,15 +219,11 @@ class TuyaDeviceBox extends Component {
       saveButton,
       updateButton,
       alreadyCreatedButton,
-      housesWithRooms,
-      selectable,
-      selected,
-      onToggleSelected
+      housesWithRooms
     },
     { device, loading, errorMessage, tooMuchStatesError, statesNumber, localPollStatus, localPollError }
   ) {
-    const supportedModel = device.tuya_supported !== false;
-    const validModel = supportedModel;
+    const validModel = device.features && device.features.length > 0;
     const online = device.online;
     const paramsArray = Array.isArray(device.params) ? device.params : [];
     const params = paramsArray.reduce((acc, param) => {
@@ -275,40 +237,22 @@ class TuyaDeviceBox extends Component {
       params.LOCAL_OVERRIDE !== undefined && params.LOCAL_OVERRIDE !== null
         ? params.LOCAL_OVERRIDE
         : device.local_override;
-    const dpMapParam = paramsArray.find(param => param.name === 'TUYA_DP_MAP');
-    const dpMapValue = dpMapParam ? dpMapParam.value : null;
-    const isJsonDpMap = dpMapValue && typeof dpMapValue === 'string' && dpMapValue.trim().startsWith('{');
     const ipAddress = params.IP_ADDRESS || device.ip || '';
     const hasProtocolSelected = protocolVersion && protocolVersion.length > 0;
     const canPollLocal = ipAddress && localKey;
     const requiresProtocol = localOverride === true;
     const canSave = !requiresProtocol || hasProtocolSelected;
-    const productKey = params.PRODUCT_KEY || device.product_key || '';
-    const productId = productKey || device.product_id || '';
 
     return (
       <div class="col-md-6">
         <div class="card">
-          <div class="card-header d-flex align-items-center justify-content-between">
+          <div class="card-header">
             <Localizer>
               <div title={<Text id={`integration.tuya.status.${online ? 'online' : 'offline'}`} />}>
                 <i class={`fe fe-radio text-${online ? 'success' : 'danger'}`} />
                 &nbsp;{device.name}
               </div>
             </Localizer>
-            {selectable && (
-              <div class="custom-control custom-checkbox">
-                <input
-                  id={`select_${deviceIndex}`}
-                  type="checkbox"
-                  class="custom-control-input"
-                  checked={selected === true}
-                  disabled={!validModel || (requiresProtocol && !hasProtocolSelected)}
-                  onChange={() => onToggleSelected && onToggleSelected(device.external_id)}
-                />
-                <label class="custom-control-label" for={`select_${deviceIndex}`} />
-              </div>
-            )}
           </div>
           <div
             class={cx('dimmer', {
@@ -358,24 +302,6 @@ class TuyaDeviceBox extends Component {
                   />
                 </div>
 
-                <div class="form-group">
-                  <label class="form-label" for={`product_id_${deviceIndex}`}>
-                    <Text id="integration.tuya.device.productIdLabel" />
-                  </label>
-                  <input
-                    id={`product_id_${deviceIndex}`}
-                    type="text"
-                    value={productId}
-                    class="form-control"
-                    disabled="true"
-                  />
-                  {productKey && device.product_id && productKey !== device.product_id && (
-                    <small class="form-text text-muted">
-                      <Text id="integration.tuya.device.productIdCloudLabel" /> {device.product_id}
-                    </small>
-                  )}
-                </div>
-
                 <div class="form-group">
                   <label class="form-label" for={`device_id_${deviceIndex}`}>
                     <Text id="integration.tuya.device.idLabel" />
@@ -440,35 +366,25 @@ class TuyaDeviceBox extends Component {
                   </select>
                 </div>
 
-                {(validModel || !supportedModel) && (
-                  <div class="form-group">
-                    <button
-                      onClick={this.pollLocal}
-                      class="btn btn-outline-secondary"
-                      disabled={!canPollLocal || localPollStatus === RequestStatus.Getting}
-                    >
-                      <Text id="integration.tuya.device.localPollButton" />
-                    </button>
-                    {localPollStatus === RequestStatus.Success && (
-                      <span class="text-success ml-2">
-                        <Text id="integration.tuya.device.localPollSuccess" />
-                      </span>
-                    )}
-                    {localPollStatus === RequestStatus.Error && (
-                      <span class="text-danger ml-2">
-                        <Text id="integration.tuya.device.localPollError" /> {localPollError}
-                      </span>
-                    )}
-                    {!supportedModel && dpMapValue && (
-                      <div class="mt-3">
-                        <label class="form-label">
-                          <Text id="integration.tuya.device.dpMapLabel" />
-                        </label>
-                        <pre class="mb-2">{isJsonDpMap ? dpMapValue : JSON.stringify(dpMapValue, null, 2)}</pre>
-                      </div>
-                    )}
-                  </div>
-                )}
+                <div class="form-group">
+                  <button
+                    onClick={this.pollLocal}
+                    class="btn btn-outline-secondary"
+                    disabled={!canPollLocal || localPollStatus === RequestStatus.Getting}
+                  >
+                    <Text id="integration.tuya.device.localPollButton" />
+                  </button>
+                  {localPollStatus === RequestStatus.Success && (
+                    <span class="text-success ml-2">
+                      <Text id="integration.tuya.device.localPollSuccess" />
+                    </span>
+                  )}
+                  {localPollStatus === RequestStatus.Error && (
+                    <span class="text-danger ml-2">
+                      <Text id="integration.tuya.device.localPollError" /> {localPollError}
+                    </span>
+                  )}
+                </div>
 
                 <div class="form-group">
                   <label class="form-label" for={`room_${deviceIndex}`}>
@@ -530,20 +446,10 @@ class TuyaDeviceBox extends Component {
                     </button>
                   )}
 
-                  {!supportedModel && (
-                    <div>
-                      <div class="alert alert-warning">
-                        <Text id="integration.tuya.unmanagedModelButton" />
-                      </div>
-                      <div class="alert alert-warning py-1">
-                        <small>
-                          <Text id="integration.tuya.unmanagedModelHelp" />
-                        </small>
-                      </div>
-                      <a class="btn btn-gray" href={createGithubUrl(device)} target="_blank" rel="noopener noreferrer">
-                        <Text id="integration.tuya.device.createGithubIssue" />
-                      </a>
-                    </div>
+                  {!validModel && (
+                    <button class="btn btn-dark" disabled>
+                      <Text id="integration.tuya.unmanagedModelButton" />
+                    </button>
                   )}
 
                   {validModel && editButton && (
diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index c6ec420b14..299dc62267 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -1,13 +1,12 @@
 const { DEVICE_POLL_FREQUENCIES } = require('../../../../utils/constants');
 const { DEVICE_PARAM_NAME } = require('../utils/tuya.constants');
-const { getSupportForDevice } = require('../models');
 const { convertFeature } = require('./tuya.convertFeature');
 const logger = require('../../../../utils/logger');
 
 /**
  * @description Transform Tuya device to Gladys device.
  * @param {object} tuyaDevice - Tuya device.
- * @returns {object} Glladys device.
+ * @returns {object} Gladys device.
  * @example
  * tuya.convertDevice({ ... });
  */
@@ -70,10 +69,7 @@ function convertDevice(tuyaDevice) {
     groups[code] = { ...func, readOnly: false };
   });
 
-  const features = Object.values(groups).map((group) => convertFeature(group, externalId, tuyaDevice));
-
-  const support = getSupportForDevice(tuyaDevice);
-  const hasFeatures = features.length > 0;
+  const features = Object.values(groups).map((group) => convertFeature(group, externalId));
 
   const device = {
     name,
@@ -87,9 +83,6 @@ function convertDevice(tuyaDevice) {
     poll_frequency: DEVICE_POLL_FREQUENCIES.EVERY_30_SECONDS,
     should_poll: true,
     params,
-    tuya_supported: hasFeatures ? support.supported : false,
-    tuya_support_level: hasFeatures ? support.level : 'none',
-    tuya_support_model: support.model,
   };
   if (online !== undefined) {
     device.online = online;
diff --git a/server/services/tuya/lib/device/tuya.convertFeature.js b/server/services/tuya/lib/device/tuya.convertFeature.js
index 31b833c8a2..c882a5653e 100644
--- a/server/services/tuya/lib/device/tuya.convertFeature.js
+++ b/server/services/tuya/lib/device/tuya.convertFeature.js
@@ -1,21 +1,18 @@
 const logger = require('../../../../utils/logger');
-const { DEVICE_FEATURE_UNITS } = require('../../../../utils/constants');
 const { mappings } = require('./tuya.deviceMapping');
-const { getMappingForDevice, getDpsMappingForDevice } = require('../models');
 
 /**
  * @description Transforms Tuya feature as Gladys feature.
  * @param {object} tuyaFunctions - Functions from Tuya.
  * @param {string} externalId - Gladys external ID.
- * @param {object} device - Tuya device object.
  * @returns {object} Gladys feature or undefined.
  * @example
- * convertFeature({ code: 'switch', type: 'Boolean', values: '{}' }, 'tuya:device_id', { category: 'cz' });
+ * convertFeature({ code: 'switch', type: 'Boolean', values: '{}' }, 'tuya:device_id');
  */
-function convertFeature(tuyaFunctions, externalId, device) {
+function convertFeature(tuyaFunctions, externalId) {
   const { code, values, name, readOnly } = tuyaFunctions;
 
-  const featuresCategoryAndType = getMappingForDevice(device, code) || mappings[code];
+  const featuresCategoryAndType = mappings[code];
   if (!featuresCategoryAndType) {
     logger.warn(`Tuya function with "${code}" code is not managed`);
     return undefined;
@@ -40,43 +37,12 @@ function convertFeature(tuyaFunctions, externalId, device) {
     max: 1,
     ...featuresCategoryAndType,
   };
-
-  // Apply advanced DPS mapping if available for this code (min/max/unit/scale)
-  const dpsMapping = getDpsMappingForDevice(device);
-  if (dpsMapping && Array.isArray(dpsMapping.dps)) {
-    const dpsEntry = dpsMapping.dps.find((entry) => entry.code === code);
-    if (dpsEntry) {
-      if (dpsEntry.label) {
-        feature.name = dpsEntry.label;
-      }
-      if (typeof dpsEntry.step === 'number') {
-        feature.step = dpsEntry.step;
-      } else if (typeof dpsEntry.scale === 'number' && dpsEntry.scale > 0) {
-        feature.step = dpsEntry.scale;
-      }
-      if (typeof dpsEntry.min === 'number') {
-        feature.min = dpsEntry.min;
-      }
-      if (typeof dpsEntry.max === 'number') {
-        feature.max = dpsEntry.max;
-      }
-      if (dpsEntry.unit === 'c') {
-        feature.unit = DEVICE_FEATURE_UNITS.CELSIUS;
-      }
-      if (dpsEntry.unit === 'f') {
-        feature.unit = DEVICE_FEATURE_UNITS.FAHRENHEIT;
-      }
-    }
-  }
   if ('min' in valuesObject) {
     feature.min = valuesObject.min;
   }
   if ('max' in valuesObject) {
     feature.max = valuesObject.max;
   }
-  if ('step' in valuesObject) {
-    feature.step = valuesObject.step;
-  }
 
   return feature;
 }
diff --git a/server/services/tuya/lib/device/tuya.deviceMapping.js b/server/services/tuya/lib/device/tuya.deviceMapping.js
index 712f0a3be0..09ea472700 100644
--- a/server/services/tuya/lib/device/tuya.deviceMapping.js
+++ b/server/services/tuya/lib/device/tuya.deviceMapping.js
@@ -3,7 +3,6 @@ const {
   DEVICE_FEATURE_CATEGORIES,
   DEVICE_FEATURE_UNITS,
   COVER_STATE,
-  AC_MODE,
 } = require('../../../../utils/constants');
 
 const { intToRgb, rgbToHsb, rgbToInt, hsbToRgb } = require('../../../../utils/colors');
@@ -101,45 +100,6 @@ const mappings = {
 };
 
 const writeValues = {
-  [DEVICE_FEATURE_CATEGORIES.AIR_CONDITIONING]: {
-    [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.BINARY]: (valueFromGladys) => {
-      return valueFromGladys === 1;
-    },
-    [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE]: (valueFromGladys) => {
-      if (valueFromGladys === AC_MODE.AUTO) {
-        return 'auto';
-      }
-      if (valueFromGladys === AC_MODE.COOLING) {
-        return 'cool';
-      }
-      if (valueFromGladys === AC_MODE.HEATING) {
-        return 'heat';
-      }
-      if (valueFromGladys === AC_MODE.DRYING) {
-        return 'dry';
-      }
-      if (valueFromGladys === AC_MODE.FAN) {
-        return 'fan_only';
-      }
-      return valueFromGladys;
-    },
-    [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE]: (valueFromGladys) => {
-      const parsed = parseFloat(valueFromGladys);
-      if (Number.isNaN(parsed)) {
-        return valueFromGladys;
-      }
-      // Tuya AC typically expects temperature * 10 for Celsius.
-      if (parsed > 0 && parsed < 60) {
-        return Math.round(parsed * 10);
-      }
-      return parsed;
-    },
-  },
-  [DEVICE_FEATURE_CATEGORIES.TEXT]: {
-    [DEVICE_FEATURE_TYPES.TEXT.TEXT]: (valueFromGladys) => {
-      return valueFromGladys;
-    },
-  },
   [DEVICE_FEATURE_CATEGORIES.LIGHT]: {
     [DEVICE_FEATURE_TYPES.LIGHT.BINARY]: (valueFromGladys) => {
       return valueFromGladys === 1;
@@ -184,56 +144,6 @@ const writeValues = {
 };
 
 const readValues = {
-  [DEVICE_FEATURE_CATEGORIES.AIR_CONDITIONING]: {
-    [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.BINARY]: (valueFromDevice) => {
-      return valueFromDevice === true ? 1 : 0;
-    },
-    [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE]: (valueFromDevice) => {
-      if (valueFromDevice === 'auto') {
-        return AC_MODE.AUTO;
-      }
-      if (valueFromDevice === 'cool' || valueFromDevice === 'cold' || valueFromDevice === 'cooling') {
-        return AC_MODE.COOLING;
-      }
-      if (valueFromDevice === 'heat' || valueFromDevice === 'heating' || valueFromDevice === 'hot') {
-        return AC_MODE.HEATING;
-      }
-      if (valueFromDevice === 'dry' || valueFromDevice === 'wet' || valueFromDevice === 'drying') {
-        return AC_MODE.DRYING;
-      }
-      if (valueFromDevice === 'fan' || valueFromDevice === 'fan_only') {
-        return AC_MODE.FAN;
-      }
-      return valueFromDevice;
-    },
-    [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE]: (valueFromDevice) => {
-      const parsed = typeof valueFromDevice === 'number' ? valueFromDevice : parseFloat(valueFromDevice);
-      if (Number.isNaN(parsed)) {
-        return valueFromDevice;
-      }
-      if (parsed >= 100) {
-        return parsed / 10;
-      }
-      return parsed;
-    },
-  },
-  [DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR]: {
-    [DEVICE_FEATURE_TYPES.SENSOR.DECIMAL]: (valueFromDevice) => {
-      const parsed = typeof valueFromDevice === 'number' ? valueFromDevice : parseFloat(valueFromDevice);
-      if (Number.isNaN(parsed)) {
-        return valueFromDevice;
-      }
-      if (parsed >= 100) {
-        return parsed / 10;
-      }
-      return parsed;
-    },
-  },
-  [DEVICE_FEATURE_CATEGORIES.TEXT]: {
-    [DEVICE_FEATURE_TYPES.TEXT.TEXT]: (valueFromDevice) => {
-      return valueFromDevice;
-    },
-  },
   [DEVICE_FEATURE_CATEGORIES.LIGHT]: {
     [DEVICE_FEATURE_TYPES.LIGHT.BINARY]: (valueFromDevice) => {
       return valueFromDevice === true ? 1 : 0;
diff --git a/server/services/tuya/lib/dps/air_conditioner.mapping.js b/server/services/tuya/lib/dps/air_conditioner.mapping.js
deleted file mode 100644
index 44defb7dcf..0000000000
--- a/server/services/tuya/lib/dps/air_conditioner.mapping.js
+++ /dev/null
@@ -1,84 +0,0 @@
-const dps = [
-  {
-    id: 1,
-    code: 'switch',
-    type: 'boolean',
-    label: 'Marche / Arrêt',
-  },
-  {
-    id: 2,
-    code: 'temp_set',
-    type: 'integer',
-    label: 'Température de consigne',
-    min: 16,
-    max: 32,
-    step: 1,
-    scale: 0.1,
-    raw: {
-      min: 160,
-      max: 320,
-      step: 10,
-    },
-    unit: 'c',
-  },
-  {
-    id: 3,
-    code: 'temp_current',
-    type: 'integer',
-    label: 'Température actuelle',
-    min: 0,
-    max: 60,
-    scale: 0.1,
-    raw: {
-      min: 0,
-      max: 600,
-      step: 1,
-    },
-    unit: 'c',
-  },
-  {
-    id: 4,
-    code: 'mode',
-    type: 'string',
-    label: 'Mode',
-    map: {
-      auto: 'auto',
-      cold: 'cool',
-      wet: 'dry',
-      heat: 'heat',
-      fan: 'fan_only',
-    },
-  },
-  {
-    id: 5,
-    code: 'fan_speed_enum',
-    type: 'string',
-    label: 'Vitesse ventilateur',
-    map: {
-      auto: 'auto',
-      low: 'low',
-      low_mid: 'low_mid',
-      mid: 'mid',
-      mid_high: 'mid_high',
-      high: 'high',
-      mute: 'mute',
-      turbo: 'turbo',
-    },
-  },
-  { id: 8, code: 'eco', type: 'boolean', label: 'Éco' },
-  { id: 9, code: 'drying', type: 'boolean', label: 'Déshumidification' },
-  { id: 12, code: 'heat', type: 'boolean', label: 'Chauffage auxiliaire' },
-  { id: 13, code: 'light', type: 'boolean', label: 'Lumière' },
-  { id: 15, code: 'sleep', type: 'boolean', label: 'Mode nuit' },
-  { id: 20, code: 'countdown_left', type: 'integer', label: 'Minuteur (restant)' },
-  { id: 22, code: 'countdown', type: 'integer', label: 'Minuteur' },
-  { id: 105, code: 'temp_unit_convert', type: 'string', label: 'Unité température', map: { c: 'c', f: 'f' } },
-  { id: 110, code: 'health', type: 'boolean', label: 'Santé' },
-  { id: 111, code: 'cleaning', type: 'boolean', label: 'Auto-nettoyage' },
-  { id: 112, code: 'hvac_action', type: 'string', label: 'Action HVAC' },
-];
-
-module.exports = {
-  name: 'air_conditioner_mapping',
-  dps,
-};
diff --git a/server/services/tuya/lib/dps/air_conditioner.standard.js b/server/services/tuya/lib/dps/air_conditioner.standard.js
deleted file mode 100644
index fd453d63b4..0000000000
--- a/server/services/tuya/lib/dps/air_conditioner.standard.js
+++ /dev/null
@@ -1,86 +0,0 @@
-const {
-  DEVICE_FEATURE_CATEGORIES,
-  DEVICE_FEATURE_TYPES,
-  DEVICE_FEATURE_UNITS,
-} = require('../../../../utils/constants');
-
-const mappings = {
-  switch: {
-    category: DEVICE_FEATURE_CATEGORIES.AIR_CONDITIONING,
-    type: DEVICE_FEATURE_TYPES.AIR_CONDITIONING.BINARY,
-  },
-  mode: {
-    category: DEVICE_FEATURE_CATEGORIES.AIR_CONDITIONING,
-    type: DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE,
-  },
-  temp_set: {
-    category: DEVICE_FEATURE_CATEGORIES.AIR_CONDITIONING,
-    type: DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE,
-    unit: DEVICE_FEATURE_UNITS.CELSIUS,
-  },
-  temp_current: {
-    category: DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR,
-    type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
-    unit: DEVICE_FEATURE_UNITS.CELSIUS,
-  },
-  fan_speed_enum: {
-    category: DEVICE_FEATURE_CATEGORIES.TEXT,
-    type: DEVICE_FEATURE_TYPES.TEXT.TEXT,
-  },
-  windspeed: {
-    category: DEVICE_FEATURE_CATEGORIES.TEXT,
-    type: DEVICE_FEATURE_TYPES.TEXT.TEXT,
-  },
-  eco: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  heat: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  light: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  sleep: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  drying: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  cleaning: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  health: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  child_lock: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  turbo: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  swing: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  swing_vertical: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  swing_horizontal: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-};
-
-module.exports = {
-  mappings,
-};
diff --git a/server/services/tuya/lib/models/air_conditioner.js b/server/services/tuya/lib/models/air_conditioner.js
deleted file mode 100644
index 698fa42b70..0000000000
--- a/server/services/tuya/lib/models/air_conditioner.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const { mappings } = require('../dps/air_conditioner.standard');
-const dpsMapping = require('../dps/air_conditioner.mapping');
-
-const NAME = 'air_conditioner';
-const CATEGORY = 'kt';
-const PRODUCT_IDS = [];
-const PRODUCT_KEYS = [];
-const ALLOW_CATEGORY_FALLBACK = true;
-const SUPPORTED_CODES = ['switch', 'mode', 'temp_set', 'temp_current'];
-
-module.exports = {
-  NAME,
-  CATEGORY,
-  PRODUCT_IDS,
-  PRODUCT_KEYS,
-  ALLOW_CATEGORY_FALLBACK,
-  SUPPORTED_CODES,
-  mappings,
-  dpsMapping,
-};
diff --git a/server/services/tuya/lib/models/airton_air_conditioner.js b/server/services/tuya/lib/models/airton_air_conditioner.js
deleted file mode 100644
index 7a4be25524..0000000000
--- a/server/services/tuya/lib/models/airton_air_conditioner.js
+++ /dev/null
@@ -1,35 +0,0 @@
-const { mappings } = require('../dps/air_conditioner.standard');
-const dpsMapping = require('../dps/air_conditioner.mapping');
-
-const NAME = 'airton_air_conditioner';
-const CATEGORY = 'kt';
-const PRODUCT_IDS = ['f3goccgfj6qino4c'];
-const PRODUCT_KEYS = ['keyquxnsj75xc8se'];
-const ALLOW_CATEGORY_FALLBACK = false;
-const SUPPORTED_CODES = [
-  'switch',
-  'mode',
-  'temp_set',
-  'temp_current',
-  'fan_speed_enum',
-  'eco',
-  'drying',
-  'heat',
-  'light',
-  'sleep',
-  'countdown_left',
-  'temp_unit_convert',
-  'health',
-  'cleaning',
-];
-
-module.exports = {
-  NAME,
-  CATEGORY,
-  PRODUCT_IDS,
-  PRODUCT_KEYS,
-  ALLOW_CATEGORY_FALLBACK,
-  SUPPORTED_CODES,
-  mappings,
-  dpsMapping,
-};
diff --git a/server/services/tuya/lib/models/index.js b/server/services/tuya/lib/models/index.js
deleted file mode 100644
index 983defaf2d..0000000000
--- a/server/services/tuya/lib/models/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-const airtonAirConditioner = require('./airton_air_conditioner');
-const airConditioner = require('./air_conditioner');
-const switchModel = require('./switch');
-const thermostat = require('./thermostat');
-const powerMeter = require('./power_meter');
-
-const normalizeCategoryList = (category) => (Array.isArray(category) ? category : [category]);
-const normalizeProductList = (productIds) => (Array.isArray(productIds) ? productIds : [productIds]);
-
-const models = [airtonAirConditioner, airConditioner, switchModel, thermostat, powerMeter];
-
-const categoryToModel = models.reduce((acc, model) => {
-  normalizeCategoryList(model.CATEGORY).forEach((category) => {
-    acc[category] = model;
-  });
-  return acc;
-}, {});
-
-const productToModel = models.reduce((acc, model) => {
-  normalizeProductList(model.PRODUCT_IDS || []).forEach((productId) => {
-    acc[productId] = model;
-  });
-  normalizeProductList(model.PRODUCT_KEYS || []).forEach((productKey) => {
-    acc[productKey] = model;
-  });
-  return acc;
-}, {});
-
-const getModelForDevice = (device) => {
-  if (!device) {
-    return null;
-  }
-  return productToModel[device.product_key] || productToModel[device.product_id] || categoryToModel[device.category];
-};
-
-const getMappingForDevice = (device, code) => {
-  if (!device || !code) {
-    return null;
-  }
-  const model = getModelForDevice(device);
-  if (!model || !model.mappings) {
-    return null;
-  }
-  if (Array.isArray(model.SUPPORTED_CODES) && !model.SUPPORTED_CODES.includes(code)) {
-    return null;
-  }
-  return model.mappings[code] || null;
-};
-
-const getDpsMappingForDevice = (device) => {
-  const model = getModelForDevice(device);
-  if (!model || !model.dpsMapping || !model.dpsMapping.dps) {
-    return null;
-  }
-  const filtered = Array.isArray(model.SUPPORTED_CODES)
-    ? model.dpsMapping.dps.filter((entry) => model.SUPPORTED_CODES.includes(entry.code))
-    : model.dpsMapping.dps;
-  return {
-    name: model.dpsMapping.name,
-    dps: filtered,
-  };
-};
-
-const getSupportForDevice = (device) => {
-  if (!device) {
-    return { supported: false, level: 'none', model: null };
-  }
-  const modelByProduct = productToModel[device.product_key] || productToModel[device.product_id];
-  if (modelByProduct) {
-    return { supported: true, level: 'product', model: modelByProduct.NAME || null };
-  }
-  const modelByCategory = categoryToModel[device.category];
-  if (modelByCategory && modelByCategory.ALLOW_CATEGORY_FALLBACK) {
-    return { supported: true, level: 'category', model: modelByCategory.NAME || null };
-  }
-  return { supported: false, level: 'none', model: modelByCategory ? modelByCategory.NAME || null : null };
-};
-
-module.exports = {
-  getMappingForDevice,
-  getDpsMappingForDevice,
-  getSupportForDevice,
-};
diff --git a/server/services/tuya/lib/models/power_meter.js b/server/services/tuya/lib/models/power_meter.js
deleted file mode 100644
index c855f10701..0000000000
--- a/server/services/tuya/lib/models/power_meter.js
+++ /dev/null
@@ -1,35 +0,0 @@
-const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES, DEVICE_FEATURE_UNITS } = require('../../../../utils/constants');
-
-const NAME = 'power_meter';
-const CATEGORY = 'zndb';
-const ALLOW_CATEGORY_FALLBACK = true;
-
-const mappings = {
-  cur_power: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.POWER,
-    unit: DEVICE_FEATURE_UNITS.WATT,
-  },
-  cur_voltage: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.VOLTAGE,
-    unit: DEVICE_FEATURE_UNITS.VOLT,
-  },
-  cur_current: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.CURRENT,
-    unit: DEVICE_FEATURE_UNITS.MILLI_AMPERE,
-  },
-  add_ele: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.ENERGY,
-    unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
-  },
-};
-
-module.exports = {
-  NAME,
-  CATEGORY,
-  ALLOW_CATEGORY_FALLBACK,
-  mappings,
-};
diff --git a/server/services/tuya/lib/models/switch.js b/server/services/tuya/lib/models/switch.js
deleted file mode 100644
index b3753c8ff5..0000000000
--- a/server/services/tuya/lib/models/switch.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../../utils/constants');
-
-const NAME = 'switch';
-const CATEGORY = ['cz', 'kg'];
-const PRODUCT_IDS = ['keyaqceqmgp343e7', 'cya3zxfd38g4qp8d'];
-const ALLOW_CATEGORY_FALLBACK = true;
-
-const mappings = {
-  switch: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  switch_1: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  switch_2: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  switch_3: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  switch_4: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-};
-
-module.exports = {
-  NAME,
-  CATEGORY,
-  PRODUCT_IDS,
-  ALLOW_CATEGORY_FALLBACK,
-  mappings,
-};
diff --git a/server/services/tuya/lib/models/thermostat.js b/server/services/tuya/lib/models/thermostat.js
deleted file mode 100644
index f61289d3dd..0000000000
--- a/server/services/tuya/lib/models/thermostat.js
+++ /dev/null
@@ -1,35 +0,0 @@
-const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES, DEVICE_FEATURE_UNITS } = require('../../../../utils/constants');
-
-const NAME = 'thermostat';
-const CATEGORY = 'cjkg';
-const PRODUCT_IDS = ['c03zek9b5daz7omr'];
-const ALLOW_CATEGORY_FALLBACK = false;
-
-const mappings = {
-  temp_set: {
-    category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
-    type: DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE,
-    unit: DEVICE_FEATURE_UNITS.CELSIUS,
-  },
-  temp_current: {
-    category: DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR,
-    type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
-    unit: DEVICE_FEATURE_UNITS.CELSIUS,
-  },
-  switch: {
-    category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
-    type: DEVICE_FEATURE_TYPES.AIR_CONDITIONING.BINARY,
-  },
-  mode: {
-    category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
-    type: DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE,
-  },
-};
-
-module.exports = {
-  NAME,
-  CATEGORY,
-  PRODUCT_IDS,
-  ALLOW_CATEGORY_FALLBACK,
-  mappings,
-};
diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index 951bef8084..a3d084201e 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -1,6 +1,5 @@
 const { BadParameters } = require('../../../utils/coreErrors');
 const { readValues } = require('./device/tuya.deviceMapping');
-const { getDpsMappingForDevice } = require('./models');
 const { API } = require('./utils/tuya.constants');
 const { EVENTS } = require('../../../utils/constants');
 
@@ -29,78 +28,18 @@ async function poll(device) {
   });
 
   const values = {};
-  const sources = {};
   (response.result || []).forEach((feature) => {
     values[feature.code] = feature.value;
-    sources[feature.code] = 'cloud';
   });
 
-  // Optionally map local DPS values to codes if we have a mapping and local DPS stored.
-  const dpsMapping = getDpsMappingForDevice(device);
-  const dpsParam =
-    Array.isArray(device.params) && device.params.find((param) => param.name === 'TUYA_DP_MAP');
-  const localOverrideParam =
-    Array.isArray(device.params) && device.params.find((param) => param.name === 'LOCAL_OVERRIDE');
-  const localOverride = localOverrideParam ? localOverrideParam.value === true || localOverrideParam.value === 'true' : false;
-
-  if (dpsMapping && dpsParam && typeof dpsParam.value === 'string' && localOverride) {
-    try {
-      const parsed = JSON.parse(dpsParam.value);
-      if (parsed && parsed.dps) {
-        dpsMapping.dps.forEach((entry) => {
-          const rawValue = parsed.dps[entry.id];
-          if (rawValue !== undefined) {
-            values[entry.code] = rawValue;
-            sources[entry.code] = 'local';
-          }
-        });
-      }
-    } catch (e) {
-      // ignore invalid mapping payload
-    }
-  }
-
-  // Normalize values using DPS mapping (applies to both cloud and local values)
-  if (dpsMapping && Array.isArray(dpsMapping.dps)) {
-    dpsMapping.dps.forEach((entry) => {
-      if (values[entry.code] === undefined) {
-        return;
-      }
-      let mappedValue = values[entry.code];
-      if (entry.map && typeof entry.map === 'object' && entry.map[mappedValue] !== undefined) {
-        mappedValue = entry.map[mappedValue];
-      }
-      if (entry.scale) {
-        const numeric = typeof mappedValue === 'number' ? mappedValue : parseFloat(mappedValue);
-        if (!Number.isNaN(numeric)) {
-          mappedValue = numeric * entry.scale;
-        }
-      }
-      values[entry.code] = mappedValue;
-    });
-  }
-
   device.features.forEach((deviceFeature) => {
     const [, , code] = deviceFeature.external_id.split(':');
 
     const value = values[code];
-    const categoryMapping = readValues[deviceFeature.category];
-    if (!categoryMapping || !categoryMapping[deviceFeature.type]) {
-      if (this.logger && this.logger.debug) {
-        this.logger.debug(
-          `[Tuya][poll] Skip feature "${deviceFeature.external_id}" - no mapping for ${deviceFeature.category}/${deviceFeature.type}`
-        );
-      }
-      return;
-    }
-    const transformedValue = categoryMapping[deviceFeature.type](value);
+    const transformedValue = readValues[deviceFeature.category][deviceFeature.type](value);
 
     if (deviceFeature.last_value !== transformedValue) {
       if (transformedValue !== null && transformedValue !== undefined) {
-        const source = sources[code] || 'cloud';
-        this.logger && this.logger.debug && this.logger.debug(
-          `[Tuya][poll] ${device.external_id}:${code} value=${transformedValue} source=${source}`
-        );
         this.gladys.event.emit(EVENTS.DEVICE.NEW_STATE, {
           device_feature_external_id: deviceFeature.external_id,
           state: transformedValue,
diff --git a/server/services/tuya/lib/tuya.setValue.js b/server/services/tuya/lib/tuya.setValue.js
index 57c18e0064..03fa5656b2 100644
--- a/server/services/tuya/lib/tuya.setValue.js
+++ b/server/services/tuya/lib/tuya.setValue.js
@@ -3,7 +3,6 @@ const { API } = require('./utils/tuya.constants');
 const { BadParameters } = require('../../../utils/coreErrors');
 const { writeValues } = require('./device/tuya.deviceMapping');
 const { DEVICE_PARAM_NAME } = require('./utils/tuya.constants');
-const { getDpsMappingForDevice } = require('./models');
 const TuyAPI = require('tuyapi');
 
 const getParamValue = (params, name) => {
@@ -35,43 +34,6 @@ const getLocalDpsFromCode = (code) => {
   return null;
 };
 
-const findDpsEntry = (dpsMapping, code) => {
-  if (!dpsMapping || !Array.isArray(dpsMapping.dps)) {
-    return null;
-  }
-  return dpsMapping.dps.find((entry) => entry.code === code) || null;
-};
-
-const mapValueForDps = (entry, value) => {
-  let mappedValue = value;
-  if (entry.map && typeof entry.map === 'object') {
-    const inverse = Object.keys(entry.map).reduce((acc, key) => {
-      acc[entry.map[key]] = key;
-      return acc;
-    }, {});
-    if (inverse[mappedValue] !== undefined) {
-      mappedValue = inverse[mappedValue];
-    }
-  }
-  if (entry.type === 'integer' && typeof mappedValue === 'string') {
-    const parsed = parseFloat(mappedValue);
-    if (!Number.isNaN(parsed)) {
-      mappedValue = parsed;
-    }
-  }
-  if (entry.scale && typeof mappedValue === 'number') {
-    mappedValue = Math.round(mappedValue / entry.scale);
-    if (entry.raw && typeof entry.raw.step === 'number') {
-      const step = entry.raw.step;
-      mappedValue = Math.round(mappedValue / step) * step;
-    }
-  }
-  if (entry.type === 'boolean' && typeof mappedValue === 'number') {
-    mappedValue = mappedValue === 1;
-  }
-  return mappedValue;
-};
-
 /**
  * @description Send the new device value over device protocol.
  * @param {object} device - Updated Gladys device.
@@ -97,9 +59,6 @@ async function setValue(device, deviceFeature, value) {
   logger.debug(`Change value for devices ${topic}/${command} to value ${transformedValue}...`);
 
   const params = device.params || [];
-  const dpsMapping = getDpsMappingForDevice(device);
-  const dpsEntry = findDpsEntry(dpsMapping, command);
-  const mappedValue = dpsEntry ? mapValueForDps(dpsEntry, transformedValue) : transformedValue;
   const ipAddress = getParamValue(params, DEVICE_PARAM_NAME.IP_ADDRESS);
   const localKey = getParamValue(params, DEVICE_PARAM_NAME.LOCAL_KEY);
   const protocolVersion = getParamValue(params, DEVICE_PARAM_NAME.PROTOCOL_VERSION);
@@ -109,7 +68,7 @@ async function setValue(device, deviceFeature, value) {
   const hasLocalConfig =
     ipAddress && localKey && protocolVersion && (localOverride === true || (cloudIp && ipAddress !== cloudIp));
 
-  const localDps = dpsEntry ? dpsEntry.id : getLocalDpsFromCode(command);
+  const localDps = getLocalDpsFromCode(command);
 
   if (hasLocalConfig && localDps !== null) {
     try {
@@ -120,9 +79,9 @@ async function setValue(device, deviceFeature, value) {
         version: protocolVersion,
       });
       await tuyaLocal.connect();
-      await tuyaLocal.set({ dps: localDps, set: mappedValue });
+      await tuyaLocal.set({ dps: localDps, set: transformedValue });
       await tuyaLocal.disconnect();
-      logger.debug(`[Tuya][setValue][local] device=${topic} dps=${localDps} value=${mappedValue}`);
+      logger.debug(`[Tuya][setValue][local] device=${topic} dps=${localDps} value=${transformedValue}`);
       return;
     } catch (e) {
       logger.warn(`[Tuya][setValue][local] failed, fallback to cloud`, e);
@@ -136,7 +95,7 @@ async function setValue(device, deviceFeature, value) {
       commands: [
         {
           code: command,
-          value: mappedValue,
+          value: transformedValue,
         },
       ],
     },
diff --git a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
index 61b9df126d..bd39be94ab 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
@@ -4,7 +4,7 @@ const { convertFeature } = require('../../../../../../services/tuya/lib/device/t
 
 describe('Tuya convert feature', () => {
   it('should return undefined when code not exist', () => {
-    const result = convertFeature({ code: 'NOT_EXIST' }, 'externalId', { category: 'cz' });
+    const result = convertFeature({ code: 'NOT_EXIST' }, 'externalId');
     expect(result).to.eq(undefined);
   });
 
@@ -18,7 +18,6 @@ describe('Tuya convert feature', () => {
         values: '{"min":100,"max":1000}',
       },
       'externalId',
-      { category: 'cz' },
     );
     expect(result).to.deep.eq({
       category: 'switch',
@@ -43,7 +42,6 @@ describe('Tuya convert feature', () => {
         values: '{',
       },
       'externalId',
-      { category: 'cz' },
     );
     expect(result).to.deep.eq({
       category: 'switch',
@@ -57,30 +55,4 @@ describe('Tuya convert feature', () => {
       type: 'binary',
     });
   });
-
-  it('should use air conditioner mapping', () => {
-    const result = convertFeature(
-      {
-        code: 'temp_set',
-        type: 'Integer',
-        name: 'temp',
-        readOnly: false,
-        values: '{"min":160,"max":880,"scale":1,"step":10}',
-      },
-      'externalId',
-      { category: 'kt', product_id: 'keyquxnsj75xc8se' },
-    );
-    expect(result).to.deep.eq({
-      category: 'air-conditioning',
-      external_id: 'externalId:temp_set',
-      has_feedback: false,
-      max: 880,
-      min: 160,
-      name: 'temp',
-      read_only: false,
-      selector: 'externalId:temp_set',
-      type: 'target-temperature',
-      unit: 'celsius',
-    });
-  });
 });

From 3612b9c1fea3a7f83f983ad497f65d24ecb12d63 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 15 Feb 2026 19:13:51 +0100
Subject: [PATCH 06/90] feat: add local polling and scanning tests for
 TuyaHandler

---
 .../lib/controllers/tuya.controller.test.js   |  50 +++++++++
 .../tuya/lib/tuya.discoverDevices.test.js     |   5 +-
 .../services/tuya/lib/tuya.localPoll.test.js  | 104 ++++++++++++++++++
 .../services/tuya/lib/tuya.localScan.test.js  |  67 +++++++++++
 .../services/tuya/lib/tuya.setValue.test.js   |  82 +++++++++++++-
 5 files changed, 306 insertions(+), 2 deletions(-)
 create mode 100644 server/test/services/tuya/lib/tuya.localPoll.test.js
 create mode 100644 server/test/services/tuya/lib/tuya.localScan.test.js

diff --git a/server/test/services/tuya/lib/controllers/tuya.controller.test.js b/server/test/services/tuya/lib/controllers/tuya.controller.test.js
index ee140346a4..e5ab0fc1b7 100644
--- a/server/test/services/tuya/lib/controllers/tuya.controller.test.js
+++ b/server/test/services/tuya/lib/controllers/tuya.controller.test.js
@@ -5,6 +5,14 @@ const { assert, fake } = sinon;
 
 const tuyaManager = {
   discoverDevices: fake.resolves([]),
+  localPoll: fake.resolves({ dps: { 1: true } }),
+  localScan: fake.resolves({ device1: { ip: '1.1.1.1', version: '3.3' } }),
+  discoveredDevices: [
+    {
+      external_id: 'tuya:device1',
+      params: [],
+    },
+  ],
 };
 
 describe('TuyaController GET /api/v1/service/tuya/discover', () => {
@@ -26,3 +34,45 @@ describe('TuyaController GET /api/v1/service/tuya/discover', () => {
     assert.calledOnce(res.json);
   });
 });
+
+describe('TuyaController POST /api/v1/service/tuya/local-poll', () => {
+  let controller;
+
+  beforeEach(() => {
+    controller = TuyaController(tuyaManager);
+    sinon.reset();
+  });
+
+  it('should return local poll result', async () => {
+    const req = {
+      body: { deviceId: 'device1', ip: '1.1.1.1', localKey: 'key', protocolVersion: '3.3' },
+    };
+    const res = {
+      json: fake.returns([]),
+    };
+
+    await controller['post /api/v1/service/tuya/local-poll'].controller(req, res);
+    assert.calledOnce(tuyaManager.localPoll);
+    assert.calledOnce(res.json);
+  });
+});
+
+describe('TuyaController POST /api/v1/service/tuya/local-scan', () => {
+  let controller;
+
+  beforeEach(() => {
+    controller = TuyaController(tuyaManager);
+    sinon.reset();
+  });
+
+  it('should run local scan and return devices', async () => {
+    const req = { body: { timeoutSeconds: 1 } };
+    const res = {
+      json: fake.returns([]),
+    };
+
+    await controller['post /api/v1/service/tuya/local-scan'].controller(req, res);
+    assert.calledOnce(tuyaManager.localScan);
+    assert.calledOnce(res.json);
+  });
+});
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index f235f485f3..b3eeb3a88e 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -27,7 +27,6 @@ describe('TuyaHandler.discoverDevices', () => {
   beforeEach(() => {
     sinon.reset();
     tuyaHandler.status = STATUS.CONNECTED;
-    tuyaHandler.localScan = fake.resolves({});
     tuyaHandler.connector = {
       request: sinon
         .stub()
@@ -162,6 +161,10 @@ describe('TuyaHandler.discoverDevices', () => {
             name: 'IP_ADDRESS',
             value: '1.1.1.1',
           },
+          {
+            name: 'CLOUD_IP',
+            value: '1.1.1.1',
+          },
         ],
         selector: 'tuya:uuid',
         service_id: 'ffa13430-df93-488a-9733-5c540e9558e0',
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
new file mode 100644
index 0000000000..2ca1dbb409
--- /dev/null
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -0,0 +1,104 @@
+const sinon = require('sinon');
+const { expect } = require('chai');
+const proxyquire = require('proxyquire').noCallThru();
+const { BadParameters } = require('../../../../utils/coreErrors');
+
+describe('TuyaHandler.localPoll', () => {
+  it('should throw if missing parameters', async () => {
+    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+      tuyapi: function TuyAPIStub() {},
+    });
+    try {
+      await localPoll({});
+    } catch (e) {
+      expect(e).to.be.instanceOf(BadParameters);
+      expect(e.message).to.equal('Missing local connection parameters');
+      return;
+    }
+    throw new Error('Expected error');
+  });
+
+  it('should return dps on success', async () => {
+    const connect = sinon.stub().resolves();
+    const get = sinon.stub().resolves({ dps: { 1: true } });
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.get = get;
+      this.disconnect = disconnect;
+    }
+    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+      tuyapi: TuyAPIStub,
+    });
+    const result = await localPoll({
+      deviceId: 'device',
+      ip: '1.1.1.1',
+      localKey: 'key',
+      protocolVersion: '3.3',
+    });
+    expect(result).to.deep.equal({ dps: { 1: true } });
+    expect(connect.calledOnce).to.equal(true);
+    expect(get.calledOnce).to.equal(true);
+    expect(disconnect.calledOnce).to.equal(true);
+  });
+
+  it('should throw on invalid response', async () => {
+    const connect = sinon.stub().resolves();
+    const get = sinon.stub().resolves('parse data error');
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.get = get;
+      this.disconnect = disconnect;
+    }
+    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+      tuyapi: TuyAPIStub,
+    });
+    try {
+      await localPoll({
+        deviceId: 'device',
+        ip: '1.1.1.1',
+        localKey: 'key',
+        protocolVersion: '3.3',
+      });
+    } catch (e) {
+      expect(e).to.be.instanceOf(BadParameters);
+      expect(e.message).to.include('Invalid local poll response');
+      return;
+    }
+    throw new Error('Expected error');
+  });
+
+  it('should timeout', async () => {
+    const clock = sinon.useFakeTimers();
+    const connect = sinon.stub().resolves();
+    const get = sinon.stub().returns(new Promise(() => {}));
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.get = get;
+      this.disconnect = disconnect;
+    }
+    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+      tuyapi: TuyAPIStub,
+    });
+    const promise = localPoll({
+      deviceId: 'device',
+      ip: '1.1.1.1',
+      localKey: 'key',
+      protocolVersion: '3.3',
+      timeoutMs: 1000,
+    });
+    await clock.tickAsync(1100);
+    try {
+      await promise;
+    } catch (e) {
+      expect(e).to.be.instanceOf(BadParameters);
+      expect(e.message).to.equal('Local poll timeout');
+      clock.restore();
+      return;
+    }
+    clock.restore();
+    throw new Error('Expected error');
+  });
+});
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
new file mode 100644
index 0000000000..390801bae5
--- /dev/null
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -0,0 +1,67 @@
+const sinon = require('sinon');
+const { expect } = require('chai');
+const proxyquire = require('proxyquire').noCallThru();
+
+describe('TuyaHandler.localScan', () => {
+  it('should return discovered devices from udp payload', async () => {
+    const sockets = [];
+    const dgramStub = {
+      createSocket: () => {
+        const handlers = {};
+        const socket = {
+          on: (event, cb) => {
+            handlers[event] = cb;
+          },
+          bind: () => {},
+          close: () => {},
+          handlers,
+        };
+        sockets.push(socket);
+        return socket;
+      },
+    };
+
+    class MessageParserStub {
+      parse() {
+        return [
+          {
+            payload: {
+              gwId: 'device-id',
+              ip: '1.1.1.1',
+              version: '3.3',
+              productKey: 'product-key',
+            },
+          },
+        ];
+      }
+    }
+
+    const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
+      dgram: dgramStub,
+      'tuyapi/lib/message-parser': { MessageParser: MessageParserStub },
+      'tuyapi/lib/config': { UDP_KEY: 'key' },
+    });
+
+    const clock = sinon.useFakeTimers();
+    const promise = localScan(1);
+
+    // Trigger message on all sockets
+    sockets.forEach((socket) => {
+      if (socket.handlers.message) {
+        socket.handlers.message(Buffer.from('test'));
+      }
+    });
+
+    await clock.tickAsync(1100);
+    const result = await promise;
+    clock.restore();
+
+    expect(result).to.deep.equal({
+      'device-id': {
+        ip: '1.1.1.1',
+        version: '3.3',
+        productKey: 'product-key',
+      },
+    });
+  });
+});
diff --git a/server/test/services/tuya/lib/tuya.setValue.test.js b/server/test/services/tuya/lib/tuya.setValue.test.js
index 4cec8115fb..6160d50efd 100644
--- a/server/test/services/tuya/lib/tuya.setValue.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.test.js
@@ -1,10 +1,11 @@
 const sinon = require('sinon');
+const proxyquire = require('proxyquire').noCallThru();
 
 const { assert, fake } = sinon;
 
 const { expect } = require('chai');
 const TuyaHandler = require('../../../../services/tuya/lib/index');
-const { API } = require('../../../../services/tuya/lib/utils/tuya.constants');
+const { API, DEVICE_PARAM_NAME } = require('../../../../services/tuya/lib/utils/tuya.constants');
 const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../../utils/constants');
 const { BadParameters } = require('../../../../utils/coreErrors');
 
@@ -88,4 +89,83 @@ describe('TuyaHandler.setValue', () => {
       body: { commands: [{ code: 'switch_0', value: true }] },
     });
   });
+
+  it('should call local tuyapi when local params are set', async () => {
+    const connect = sinon.stub().resolves();
+    const set = sinon.stub().resolves();
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.set = set;
+      this.disconnect = disconnect;
+    }
+    const setValue = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
+      tuyapi: TuyAPIStub,
+    }).setValue;
+
+    const device = {
+      params: [
+        { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '10.0.0.2' },
+        { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+        { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.3' },
+        { name: DEVICE_PARAM_NAME.CLOUD_IP, value: '1.1.1.1' },
+        { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+      ],
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:switch_1',
+      category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+      type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub() },
+      gladys: {},
+    };
+
+    await setValue.call(ctx, device, deviceFeature, 1);
+
+    expect(connect.calledOnce).to.equal(true);
+    expect(set.calledOnce).to.equal(true);
+    expect(disconnect.calledOnce).to.equal(true);
+    expect(ctx.connector.request.called).to.equal(false);
+  });
+
+  it('should fallback to cloud when local call fails', async () => {
+    const connect = sinon.stub().rejects(new Error('local error'));
+    const set = sinon.stub().resolves();
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.set = set;
+      this.disconnect = disconnect;
+    }
+    const setValue = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
+      tuyapi: TuyAPIStub,
+    }).setValue;
+
+    const device = {
+      params: [
+        { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '10.0.0.2' },
+        { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+        { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.3' },
+        { name: DEVICE_PARAM_NAME.CLOUD_IP, value: '1.1.1.1' },
+        { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+      ],
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:switch_1',
+      category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+      type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub().resolves({}) },
+      gladys: {},
+    };
+
+    await setValue.call(ctx, device, deviceFeature, 1);
+
+    expect(ctx.connector.request.calledOnce).to.equal(true);
+  });
 });

From 7ea3468f1c8eeb905f561fe805625d36386d4348 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 15 Feb 2026 19:26:04 +0100
Subject: [PATCH 07/90] =?UTF-8?q?refactor:=20simplifier=20la=20logique=20d?=
 =?UTF-8?q?e=20poll=20local=20et=20am=C3=A9liorer=20la=20lisibilit=C3=A9?=
 =?UTF-8?q?=20du=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../integration/all/tuya/TuyaDeviceBox.jsx    |  2 +-
 .../all/tuya/setup-page/SetupTab.jsx          |  4 +--
 server/services/tuya/api/tuya.controller.js   | 13 +++++++++
 .../services/tuya/lib/tuya.discoverDevices.js |  2 --
 server/services/tuya/lib/tuya.localPoll.js    | 29 ++++++++++---------
 server/services/tuya/lib/tuya.localScan.js    | 16 +++++-----
 server/services/tuya/lib/tuya.setValue.js     |  2 +-
 .../tuya/lib/tuya.discoverDevices.test.js     |  2 +-
 .../tuya/lib/tuya.loadDeviceDetails.test.js   |  2 +-
 .../services/tuya/lib/tuya.localPoll.test.js  |  1 +
 .../services/tuya/lib/tuya.localScan.test.js  |  1 +
 .../services/tuya/lib/tuya.setValue.test.js   |  9 +++---
 12 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 9c4c36c8da..306cdb62dc 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -142,7 +142,7 @@ class TuyaDeviceBox extends Component {
     } else {
       params.push({ name: 'IP_ADDRESS', value: ipAddress });
     }
-    const overrideValue = ipAddress && cloudIp && ipAddress !== cloudIp ? true : false;
+    const overrideValue = !!(ipAddress && cloudIp && ipAddress !== cloudIp);
     const overrideIndex = params.findIndex(param => param.name === 'LOCAL_OVERRIDE');
     if (overrideIndex >= 0) {
       params[overrideIndex] = { ...params[overrideIndex], value: overrideValue };
diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 8814b30827..9276343c24 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -59,9 +59,7 @@ class SetupTab extends Component {
       );
       tuyaAppAccountId = appAccountId;
 
-      const { value: appUsername } = await this.props.httpClient.get(
-        '/api/v1/service/tuya/variable/TUYA_APP_USERNAME'
-      );
+      const { value: appUsername } = await this.props.httpClient.get('/api/v1/service/tuya/variable/TUYA_APP_USERNAME');
       tuyaAppUsername = appUsername;
 
       this.setState({
diff --git a/server/services/tuya/api/tuya.controller.js b/server/services/tuya/api/tuya.controller.js
index 1c1c6a1c06..4a4f3cdb23 100644
--- a/server/services/tuya/api/tuya.controller.js
+++ b/server/services/tuya/api/tuya.controller.js
@@ -2,6 +2,13 @@ const asyncMiddleware = require('../../../api/middlewares/asyncMiddleware');
 const { DEVICE_PARAM_NAME } = require('../lib/utils/tuya.constants');
 
 module.exports = function TuyaController(tuyaManager) {
+  /**
+   * @description Upsert a device parameter in a params array.
+   * @param {Array} params - Device params.
+   * @param {string} name - Param name.
+   * @param {*} value - Param value.
+   * @returns {void}
+   */
   function upsertParam(params, name, value) {
     if (value === undefined || value === null) {
       return;
@@ -14,6 +21,12 @@ module.exports = function TuyaController(tuyaManager) {
     }
   }
 
+  /**
+   * @description Merge local scan data into a discovered device.
+   * @param {object} device - Discovered device.
+   * @param {object} localInfo - Local scan info.
+   * @returns {object} Updated device.
+   */
   function updateDiscoveredDeviceWithLocalInfo(device, localInfo) {
     if (!device || !localInfo) {
       return device;
diff --git a/server/services/tuya/lib/tuya.discoverDevices.js b/server/services/tuya/lib/tuya.discoverDevices.js
index 5cf9b3b20c..35e4a9f395 100644
--- a/server/services/tuya/lib/tuya.discoverDevices.js
+++ b/server/services/tuya/lib/tuya.discoverDevices.js
@@ -31,8 +31,6 @@ async function discoverDevices() {
   });
 
   let devices = [];
-  const localDevicesById = {};
-
   try {
     devices = await this.loadDevices();
     logger.info(`${devices.length} Tuya devices found`);
diff --git a/server/services/tuya/lib/tuya.localPoll.js b/server/services/tuya/lib/tuya.localPoll.js
index 31b5a2a1db..94cc8eab0f 100644
--- a/server/services/tuya/lib/tuya.localPoll.js
+++ b/server/services/tuya/lib/tuya.localPoll.js
@@ -1,11 +1,13 @@
-const logger = require('../../../utils/logger');
 const TuyAPI = require('tuyapi');
+const logger = require('../../../utils/logger');
 const { BadParameters } = require('../../../utils/coreErrors');
 
 /**
  * @description Poll a Tuya device locally to retrieve DPS map.
  * @param {object} payload - Local connection info.
  * @returns {Promise<object>} DPS map.
+ * @example
+ * await localPoll({ deviceId: 'id', ip: '1.1.1.1', localKey: 'key', protocolVersion: '3.3' });
  */
 async function localPoll(payload) {
   const { deviceId, ip, localKey, protocolVersion, timeoutMs = 8000 } = payload || {};
@@ -30,9 +32,9 @@ async function localPoll(payload) {
     })();
     const data = await Promise.race([
       operation,
-      new Promise((_, reject) =>
-        setTimeout(() => reject(new BadParameters('Local poll timeout')), effectiveTimeout),
-      ),
+      new Promise((_, reject) => {
+        setTimeout(() => reject(new BadParameters('Local poll timeout')), effectiveTimeout);
+      }),
     ]);
     await tuyaLocal.disconnect();
     return data;
@@ -40,20 +42,21 @@ async function localPoll(payload) {
 
   try {
     const attempts =
-      protocolVersion === '3.5'
-        ? [{ schema: true }, { schema: true, dps: [1] }, {}]
-        : [{ schema: true }];
-    let data = null;
-    for (let i = 0; i < attempts.length; i += 1) {
+      protocolVersion === '3.5' ? [{ schema: true }, { schema: true, dps: [1] }, {}] : [{ schema: true }];
+    const tryAttempt = async (index) => {
+      if (index >= attempts.length) {
+        return null;
+      }
       try {
-        data = await runGet(attempts[i]);
-        break;
+        return await runGet(attempts[index]);
       } catch (e) {
-        if (i === attempts.length - 1) {
+        if (index === attempts.length - 1) {
           throw e;
         }
+        return tryAttempt(index + 1);
       }
-    }
+    };
+    const data = await tryAttempt(0);
     if (!data || typeof data !== 'object' || !data.dps) {
       const errorMessage =
         typeof data === 'string' ? `Invalid local poll response: ${data}` : 'Invalid local poll response';
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index f39d2940c1..249ae42f47 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -1,7 +1,7 @@
 const dgram = require('dgram');
-const logger = require('../../../utils/logger');
-const { MessageParser } = require('tuyapi/lib/message-parser');
 const { UDP_KEY } = require('tuyapi/lib/config');
+const { MessageParser } = require('tuyapi/lib/message-parser');
+const logger = require('../../../utils/logger');
 
 const DEFAULT_PORTS = [6666, 6667, 7000];
 
@@ -9,6 +9,8 @@ const DEFAULT_PORTS = [6666, 6667, 7000];
  * @description Scan local network for Tuya devices over UDP to retrieve protocol version.
  * @param {number} timeoutSeconds - Scan duration in seconds.
  * @returns {Promise<object>} Map of deviceId -> { ip, version, productKey }.
+ * @example
+ * await localScan(5);
  */
 async function localScan(timeoutSeconds = 10) {
   const devices = {};
@@ -29,10 +31,8 @@ async function localScan(timeoutSeconds = 10) {
       return;
     }
 
-    const deviceId = payload.gwId || payload.devId || payload.id;
-    const ip = payload.ip;
-    const version = payload.version;
-    const productKey = payload.productKey;
+    const { gwId, devId, id, ip, version, productKey } = payload;
+    const deviceId = gwId || devId || id;
 
     if (!deviceId) {
       return;
@@ -59,7 +59,9 @@ async function localScan(timeoutSeconds = 10) {
     sockets.push(socket);
   });
 
-  await new Promise((resolve) => setTimeout(resolve, timeoutSeconds * 1000));
+  await new Promise((resolve) => {
+    setTimeout(resolve, timeoutSeconds * 1000);
+  });
 
   sockets.forEach((socket) => {
     try {
diff --git a/server/services/tuya/lib/tuya.setValue.js b/server/services/tuya/lib/tuya.setValue.js
index 03fa5656b2..cbdab209f1 100644
--- a/server/services/tuya/lib/tuya.setValue.js
+++ b/server/services/tuya/lib/tuya.setValue.js
@@ -1,9 +1,9 @@
+const TuyAPI = require('tuyapi');
 const logger = require('../../../utils/logger');
 const { API } = require('./utils/tuya.constants');
 const { BadParameters } = require('../../../utils/coreErrors');
 const { writeValues } = require('./device/tuya.deviceMapping');
 const { DEVICE_PARAM_NAME } = require('./utils/tuya.constants');
-const TuyAPI = require('tuyapi');
 
 const getParamValue = (params, name) => {
   const found = (params || []).find((param) => param.name === name);
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index b3eeb3a88e..6e671b3ba4 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -62,7 +62,7 @@ describe('TuyaHandler.discoverDevices', () => {
               },
             ],
           },
-        }),
+        })
         .onThirdCall()
         .resolves({
           result: {
diff --git a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
index 5b9406e3f3..a04c3c93c8 100644
--- a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
@@ -1,7 +1,7 @@
 const { expect } = require('chai');
 const sinon = require('sinon');
 
-const { assert, fake } = sinon;
+const { assert } = sinon;
 
 const TuyaHandler = require('../../../../services/tuya/lib/index');
 const { API } = require('../../../../services/tuya/lib/utils/tuya.constants');
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index 2ca1dbb409..0a4948e8dd 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -1,3 +1,4 @@
+/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */
 const sinon = require('sinon');
 const { expect } = require('chai');
 const proxyquire = require('proxyquire').noCallThru();
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index 390801bae5..69e6102cb3 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -1,3 +1,4 @@
+/* eslint-disable require-jsdoc, jsdoc/require-jsdoc, class-methods-use-this */
 const sinon = require('sinon');
 const { expect } = require('chai');
 const proxyquire = require('proxyquire').noCallThru();
diff --git a/server/test/services/tuya/lib/tuya.setValue.test.js b/server/test/services/tuya/lib/tuya.setValue.test.js
index 6160d50efd..5c1e057bf8 100644
--- a/server/test/services/tuya/lib/tuya.setValue.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.test.js
@@ -1,3 +1,4 @@
+/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */
 const sinon = require('sinon');
 const proxyquire = require('proxyquire').noCallThru();
 
@@ -99,9 +100,9 @@ describe('TuyaHandler.setValue', () => {
       this.set = set;
       this.disconnect = disconnect;
     }
-    const setValue = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
+    const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
       tuyapi: TuyAPIStub,
-    }).setValue;
+    });
 
     const device = {
       params: [
@@ -140,9 +141,9 @@ describe('TuyaHandler.setValue', () => {
       this.set = set;
       this.disconnect = disconnect;
     }
-    const setValue = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
+    const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
       tuyapi: TuyAPIStub,
-    }).setValue;
+    });
 
     const device = {
       params: [

From e2d718977421c0790f79d4c1cbf5423f1f1ef3f3 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 15 Feb 2026 19:45:59 +0100
Subject: [PATCH 08/90] =?UTF-8?q?refactor:=20am=C3=A9liorer=20la=20logique?=
 =?UTF-8?q?=20de=20chargement=20des=20appareils=20Tuya=20et=20mettre=20?=
 =?UTF-8?q?=C3=A0=20jour=20les=20tests=20associ=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/services/tuya/lib/tuya.loadDevices.js               | 5 ++++-
 server/test/services/tuya/lib/tuya.discoverDevices.test.js | 6 ++++++
 server/test/services/tuya/lib/tuya.init.test.js            | 7 +++++--
 server/test/services/tuya/lib/tuya.loadDevices.test.js     | 4 ++--
 server/test/services/tuya/lib/tuya.setValue.test.js        | 4 +++-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/server/services/tuya/lib/tuya.loadDevices.js b/server/services/tuya/lib/tuya.loadDevices.js
index 11812e5605..4450f155ff 100644
--- a/server/services/tuya/lib/tuya.loadDevices.js
+++ b/server/services/tuya/lib/tuya.loadDevices.js
@@ -23,8 +23,11 @@ async function loadDevices(pageNo = 1, pageSize = 100) {
 
   const result = responsePage.result || [];
   const list = Array.isArray(result) ? result : result.list || [];
+  const hasMore = Array.isArray(result)
+    ? list.length === pageSize
+    : result.has_more === true || list.length === pageSize;
 
-  if (list.length === pageSize) {
+  if (hasMore) {
     const nextResult = await this.loadDevices(pageNo + 1, pageSize);
     nextResult.forEach((device) => list.push(device));
   }
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index 6e671b3ba4..c6d5a5eb77 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -165,7 +165,13 @@ describe('TuyaHandler.discoverDevices', () => {
             name: 'CLOUD_IP',
             value: '1.1.1.1',
           },
+          {
+            name: 'LOCAL_OVERRIDE',
+            value: false,
+          },
         ],
+        product_id: undefined,
+        product_key: undefined,
         selector: 'tuya:uuid',
         service_id: 'ffa13430-df93-488a-9733-5c540e9558e0',
         should_poll: true,
diff --git a/server/test/services/tuya/lib/tuya.init.test.js b/server/test/services/tuya/lib/tuya.init.test.js
index dbd7cdb01d..c17d19d33b 100644
--- a/server/test/services/tuya/lib/tuya.init.test.js
+++ b/server/test/services/tuya/lib/tuya.init.test.js
@@ -43,16 +43,19 @@ describe('TuyaHandler.init', () => {
       .withArgs(GLADYS_VARIABLES.ACCESS_KEY, serviceId)
       .returns('accessKey')
       .withArgs(GLADYS_VARIABLES.SECRET_KEY, serviceId)
-      .returns('secretKey');
+      .returns('secretKey')
+      .withArgs(GLADYS_VARIABLES.APP_USERNAME, serviceId)
+      .returns('appUsername');
 
     await tuyaHandler.init();
 
     expect(tuyaHandler.status).to.eq(STATUS.CONNECTED);
 
-    assert.callCount(gladys.variable.getValue, 3);
+    assert.callCount(gladys.variable.getValue, 4);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ENDPOINT, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ACCESS_KEY, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.SECRET_KEY, serviceId);
+    assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.APP_USERNAME, serviceId);
 
     assert.calledOnce(client.init);
 
diff --git a/server/test/services/tuya/lib/tuya.loadDevices.test.js b/server/test/services/tuya/lib/tuya.loadDevices.test.js
index 61eef3f39a..9b3e992690 100644
--- a/server/test/services/tuya/lib/tuya.loadDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDevices.test.js
@@ -22,9 +22,9 @@ describe('TuyaHandler.loadDevices', () => {
       request: sinon
         .stub()
         .onFirstCall()
-        .resolves({ result: [{ id: 1 }] })
+        .resolves({ result: { list: [{ id: 1 }], has_more: true } })
         .onSecondCall()
-        .resolves({ result: [{ id: 2 }] }),
+        .resolves({ result: { list: [{ id: 2 }], has_more: false } }),
     };
   });
 
diff --git a/server/test/services/tuya/lib/tuya.setValue.test.js b/server/test/services/tuya/lib/tuya.setValue.test.js
index 5c1e057bf8..35449361ea 100644
--- a/server/test/services/tuya/lib/tuya.setValue.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.test.js
@@ -1,6 +1,8 @@
 /* eslint-disable require-jsdoc, jsdoc/require-jsdoc */
 const sinon = require('sinon');
-const proxyquire = require('proxyquire').noCallThru();
+const proxyquire = require('proxyquire')
+  .noCallThru()
+  .noPreserveCache();
 
 const { assert, fake } = sinon;
 

From 5f2d2a595d41cee67d45d8398f484a9a3b82a935 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 15 Feb 2026 20:16:41 +0100
Subject: [PATCH 09/90] =?UTF-8?q?fix:=20corriger=20la=20logique=20de=20pag?=
 =?UTF-8?q?ination=20dans=20loadDevices=20et=20ajouter=20un=20champ=20d'er?=
 =?UTF-8?q?reur=20dans=20le=20payload=20de=20l'=C3=A9v=C3=A9nement=20WebSo?=
 =?UTF-8?q?cket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/services/tuya/lib/tuya.loadDevices.js    | 7 ++++---
 server/services/tuya/lib/tuya.setValue.js       | 2 +-
 server/test/services/tuya/lib/tuya.init.test.js | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/services/tuya/lib/tuya.loadDevices.js b/server/services/tuya/lib/tuya.loadDevices.js
index 4450f155ff..a0abbfdd6c 100644
--- a/server/services/tuya/lib/tuya.loadDevices.js
+++ b/server/services/tuya/lib/tuya.loadDevices.js
@@ -23,9 +23,10 @@ async function loadDevices(pageNo = 1, pageSize = 100) {
 
   const result = responsePage.result || [];
   const list = Array.isArray(result) ? result : result.list || [];
-  const hasMore = Array.isArray(result)
-    ? list.length === pageSize
-    : result.has_more === true || list.length === pageSize;
+  let hasMore = list.length === pageSize;
+  if (!Array.isArray(result) && typeof result.has_more === 'boolean') {
+    hasMore = result.has_more;
+  }
 
   if (hasMore) {
     const nextResult = await this.loadDevices(pageNo + 1, pageSize);
diff --git a/server/services/tuya/lib/tuya.setValue.js b/server/services/tuya/lib/tuya.setValue.js
index cbdab209f1..2b97de18ca 100644
--- a/server/services/tuya/lib/tuya.setValue.js
+++ b/server/services/tuya/lib/tuya.setValue.js
@@ -27,7 +27,7 @@ const getLocalDpsFromCode = (code) => {
   if (code === 'switch') {
     return 1;
   }
-  const match = code.match(/_(\\d+)$/);
+  const match = code.match(/_(\d+)$/);
   if (match) {
     return parseInt(match[1], 10);
   }
diff --git a/server/test/services/tuya/lib/tuya.init.test.js b/server/test/services/tuya/lib/tuya.init.test.js
index c17d19d33b..4ac06cf7d8 100644
--- a/server/test/services/tuya/lib/tuya.init.test.js
+++ b/server/test/services/tuya/lib/tuya.init.test.js
@@ -66,7 +66,7 @@ describe('TuyaHandler.init', () => {
     });
     assert.calledWith(gladys.event.emit, EVENTS.WEBSOCKET.SEND_ALL, {
       type: WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS,
-      payload: { status: STATUS.CONNECTED },
+      payload: { status: STATUS.CONNECTED, error: null },
     });
   });
 });

From ebd3dc366eb9ae86a5c04c970c5aa0e71b7847f2 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 15 Feb 2026 22:03:15 +0100
Subject: [PATCH 10/90] =?UTF-8?q?refactor:=20am=C3=A9liorer=20la=20logique?=
 =?UTF-8?q?=20de=20mise=20=C3=A0=20jour=20des=20appareils=20d=C3=A9couvert?=
 =?UTF-8?q?s=20et=20ajouter=20des=20tests=20pour=20la=20gestion=20des=20ap?=
 =?UTF-8?q?pareils=20locaux?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/services/tuya/api/tuya.controller.js   |   3 -
 server/services/tuya/lib/tuya.localPoll.js    |   5 +-
 .../lib/controllers/tuya.controller.test.js   |  72 +++++++++++
 .../lib/device/tuya.convertDevice.test.js     |  64 ++++++++++
 .../tuya/lib/tuya.loadDevices.test.js         |  14 +++
 .../services/tuya/lib/tuya.localPoll.test.js  |  55 ++++++++
 .../services/tuya/lib/tuya.localScan.test.js  |  61 +++++++++
 .../services/tuya/lib/tuya.setValue.test.js   | 119 ++++++++++++++++++
 8 files changed, 386 insertions(+), 7 deletions(-)
 create mode 100644 server/test/services/tuya/lib/device/tuya.convertDevice.test.js

diff --git a/server/services/tuya/api/tuya.controller.js b/server/services/tuya/api/tuya.controller.js
index 4a4f3cdb23..4a8afa8a02 100644
--- a/server/services/tuya/api/tuya.controller.js
+++ b/server/services/tuya/api/tuya.controller.js
@@ -112,9 +112,6 @@ module.exports = function TuyaController(tuyaManager) {
       const updatedDevices = tuyaManager.discoveredDevices.map((device) => {
         const deviceId = device.external_id && device.external_id.split(':')[1];
         const localInfo = localDevicesById[deviceId];
-        if (!localInfo) {
-          return device;
-        }
         return updateDiscoveredDeviceWithLocalInfo(device, localInfo);
       });
       tuyaManager.discoveredDevices = updatedDevices;
diff --git a/server/services/tuya/lib/tuya.localPoll.js b/server/services/tuya/lib/tuya.localPoll.js
index 94cc8eab0f..1087b2c47e 100644
--- a/server/services/tuya/lib/tuya.localPoll.js
+++ b/server/services/tuya/lib/tuya.localPoll.js
@@ -44,13 +44,10 @@ async function localPoll(payload) {
     const attempts =
       protocolVersion === '3.5' ? [{ schema: true }, { schema: true, dps: [1] }, {}] : [{ schema: true }];
     const tryAttempt = async (index) => {
-      if (index >= attempts.length) {
-        return null;
-      }
       try {
         return await runGet(attempts[index]);
       } catch (e) {
-        if (index === attempts.length - 1) {
+        if (index >= attempts.length - 1) {
           throw e;
         }
         return tryAttempt(index + 1);
diff --git a/server/test/services/tuya/lib/controllers/tuya.controller.test.js b/server/test/services/tuya/lib/controllers/tuya.controller.test.js
index e5ab0fc1b7..79b2b0e18f 100644
--- a/server/test/services/tuya/lib/controllers/tuya.controller.test.js
+++ b/server/test/services/tuya/lib/controllers/tuya.controller.test.js
@@ -1,4 +1,5 @@
 const sinon = require('sinon');
+const { expect } = require('chai');
 const TuyaController = require('../../../../../services/tuya/api/tuya.controller');
 
 const { assert, fake } = sinon;
@@ -55,6 +56,47 @@ describe('TuyaController POST /api/v1/service/tuya/local-poll', () => {
     assert.calledOnce(tuyaManager.localPoll);
     assert.calledOnce(res.json);
   });
+
+  it('should return local poll result without updating device', async () => {
+    const req = {
+      body: { deviceId: 'unknown', ip: '1.1.1.1', localKey: 'key', protocolVersion: '3.3' },
+    };
+    const res = {
+      json: fake.returns([]),
+    };
+    tuyaManager.discoveredDevices = [{ external_id: 'tuya:device1', params: [] }];
+
+    await controller['post /api/v1/service/tuya/local-poll'].controller(req, res);
+    assert.calledOnce(tuyaManager.localPoll);
+    assert.calledWith(res.json, { dps: { 1: true } });
+  });
+
+  it('should update existing params when device is found', async () => {
+    const req = {
+      body: { deviceId: 'device1', ip: '2.2.2.2', protocolVersion: '3.3' },
+    };
+    const res = {
+      json: fake.returns([]),
+    };
+    tuyaManager.discoveredDevices = [
+      {
+        external_id: 'tuya:device1',
+        product_id: 'pid',
+        product_key: 'pkey',
+        params: [{ name: 'IP_ADDRESS', value: '1.1.1.1' }],
+      },
+    ];
+
+    await controller['post /api/v1/service/tuya/local-poll'].controller(req, res);
+
+    const updated = tuyaManager.discoveredDevices[0];
+    const ipParam = updated.params.find((param) => param.name === 'IP_ADDRESS');
+    const localKeyParam = updated.params.find((param) => param.name === 'LOCAL_KEY');
+
+    expect(ipParam.value).to.equal('2.2.2.2');
+    expect(localKeyParam).to.equal(undefined);
+    assert.calledOnce(res.json);
+  });
 });
 
 describe('TuyaController POST /api/v1/service/tuya/local-scan', () => {
@@ -75,4 +117,34 @@ describe('TuyaController POST /api/v1/service/tuya/local-scan', () => {
     assert.calledOnce(tuyaManager.localScan);
     assert.calledOnce(res.json);
   });
+
+  it('should return local devices even without discovered devices', async () => {
+    const req = { body: { timeoutSeconds: 1 } };
+    const res = {
+      json: fake.returns([]),
+    };
+    tuyaManager.discoveredDevices = null;
+
+    await controller['post /api/v1/service/tuya/local-scan'].controller(req, res);
+    assert.calledOnce(tuyaManager.localScan);
+    assert.calledWith(res.json, {
+      local_devices: { device1: { ip: '1.1.1.1', version: '3.3' } },
+    });
+  });
+
+  it('should keep devices unchanged when local info is missing', async () => {
+    const req = { body: { timeoutSeconds: 1 } };
+    const res = {
+      json: fake.returns([]),
+    };
+    tuyaManager.localScan = fake.resolves({});
+    tuyaManager.discoveredDevices = [{ external_id: 'tuya:device1', params: [] }];
+
+    await controller['post /api/v1/service/tuya/local-scan'].controller(req, res);
+    assert.calledOnce(tuyaManager.localScan);
+    assert.calledWith(res.json, {
+      devices: [{ external_id: 'tuya:device1', params: [] }],
+      local_devices: {},
+    });
+  });
 });
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
new file mode 100644
index 0000000000..1d8fb0fada
--- /dev/null
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
@@ -0,0 +1,64 @@
+const { expect } = require('chai');
+
+const { convertDevice } = require('../../../../../services/tuya/lib/device/tuya.convertDevice');
+const { DEVICE_PARAM_NAME } = require('../../../../../services/tuya/lib/utils/tuya.constants');
+
+describe('tuya.convertDevice', () => {
+  it('should map params and features with optional fields', () => {
+    const tuyaDevice = {
+      id: 'device-id',
+      name: 'Device',
+      product_name: 'Model',
+      product_id: 'product-id',
+      product_key: 'product-key',
+      local_key: 'local-key',
+      ip: '1.1.1.1',
+      cloud_ip: '2.2.2.2',
+      protocol_version: '3.3',
+      local_override: true,
+      is_online: true,
+      specifications: {
+        functions: [{ code: 'switch_1', name: 'Switch', type: 'Boolean' }],
+        status: [{ code: 'cur_power', name: 'Power', type: 'Integer' }],
+      },
+    };
+
+    const device = convertDevice.call({ serviceId: 'service-id' }, tuyaDevice);
+
+    expect(device.product_id).to.equal('product-id');
+    expect(device.product_key).to.equal('product-key');
+    expect(device.online).to.equal(true);
+    expect(device.features.length).to.equal(2);
+
+    const params = device.params.reduce((acc, param) => {
+      acc[param.name] = param.value;
+      return acc;
+    }, {});
+
+    expect(params[DEVICE_PARAM_NAME.DEVICE_ID]).to.equal('device-id');
+    expect(params[DEVICE_PARAM_NAME.LOCAL_KEY]).to.equal('local-key');
+    expect(params[DEVICE_PARAM_NAME.IP_ADDRESS]).to.equal('1.1.1.1');
+    expect(params[DEVICE_PARAM_NAME.CLOUD_IP]).to.equal('2.2.2.2');
+    expect(params[DEVICE_PARAM_NAME.PROTOCOL_VERSION]).to.equal('3.3');
+    expect(params[DEVICE_PARAM_NAME.LOCAL_OVERRIDE]).to.equal(true);
+    expect(params[DEVICE_PARAM_NAME.PRODUCT_ID]).to.equal('product-id');
+    expect(params[DEVICE_PARAM_NAME.PRODUCT_KEY]).to.equal('product-key');
+  });
+
+  it('should handle missing optional fields', () => {
+    const tuyaDevice = {
+      id: 'device-id',
+      name: 'Device',
+      model: 'Model',
+      online: false,
+      specifications: {},
+    };
+
+    const device = convertDevice.call({ serviceId: 'service-id' }, tuyaDevice);
+
+    expect(device.product_id).to.equal(undefined);
+    expect(device.product_key).to.equal(undefined);
+    expect(device.online).to.equal(false);
+    expect(device.features.length).to.equal(0);
+  });
+});
diff --git a/server/test/services/tuya/lib/tuya.loadDevices.test.js b/server/test/services/tuya/lib/tuya.loadDevices.test.js
index 9b3e992690..f2d34d5eb9 100644
--- a/server/test/services/tuya/lib/tuya.loadDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDevices.test.js
@@ -49,4 +49,18 @@ describe('TuyaHandler.loadDevices', () => {
       query: { page_no: 2, page_size: 1 },
     });
   });
+
+  it('should loop on pages with array result', async () => {
+    tuyaHandler.connector.request = sinon
+      .stub()
+      .onFirstCall()
+      .resolves({ result: [{ id: 1 }] })
+      .onSecondCall()
+      .resolves({ result: [] });
+
+    const devices = await tuyaHandler.loadDevices(1, 1);
+
+    expect(devices).to.deep.eq([{ id: 1 }]);
+    assert.callCount(tuyaHandler.connector.request, 2);
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index 0a4948e8dd..86628213fb 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -70,6 +70,61 @@ describe('TuyaHandler.localPoll', () => {
     throw new Error('Expected error');
   });
 
+  it('should try multiple attempts for protocol 3.5', async () => {
+    const connect = sinon.stub().resolves();
+    const get = sinon
+      .stub()
+      .onFirstCall()
+      .rejects(new Error('fail'))
+      .onSecondCall()
+      .resolves({ dps: { 1: true } });
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.get = get;
+      this.disconnect = disconnect;
+    }
+    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+      tuyapi: TuyAPIStub,
+    });
+    const result = await localPoll({
+      deviceId: 'device',
+      ip: '1.1.1.1',
+      localKey: 'key',
+      protocolVersion: '3.5',
+      timeoutMs: 1000,
+    });
+    expect(result).to.deep.equal({ dps: { 1: true } });
+    expect(get.calledTwice).to.equal(true);
+  });
+
+  it('should throw on object without dps', async () => {
+    const connect = sinon.stub().resolves();
+    const get = sinon.stub().resolves({ ok: true });
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.get = get;
+      this.disconnect = disconnect;
+    }
+    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+      tuyapi: TuyAPIStub,
+    });
+    try {
+      await localPoll({
+        deviceId: 'device',
+        ip: '1.1.1.1',
+        localKey: 'key',
+        protocolVersion: '3.3',
+      });
+    } catch (e) {
+      expect(e).to.be.instanceOf(BadParameters);
+      expect(e.message).to.equal('Invalid local poll response');
+      return;
+    }
+    throw new Error('Expected error');
+  });
+
   it('should timeout', async () => {
     const clock = sinon.useFakeTimers();
     const connect = sinon.stub().resolves();
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index 69e6102cb3..5d4c3b38af 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -65,4 +65,65 @@ describe('TuyaHandler.localScan', () => {
       },
     });
   });
+
+  it('should ignore invalid payloads and handle socket errors', async () => {
+    const sockets = [];
+    const dgramStub = {
+      createSocket: () => {
+        const handlers = {};
+        const socket = {
+          on: (event, cb) => {
+            handlers[event] = cb;
+          },
+          bind: () => {},
+          close: () => {
+            throw new Error('close error');
+          },
+          handlers,
+        };
+        sockets.push(socket);
+        return socket;
+      },
+    };
+
+    let callIndex = 0;
+    class MessageParserStub {
+      parse() {
+        callIndex += 1;
+        if (callIndex === 1) {
+          throw new Error('bad payload');
+        }
+        if (callIndex === 2) {
+          return [{ payload: 'invalid' }];
+        }
+        return [{ payload: { ip: '1.1.1.1' } }];
+      }
+    }
+
+    const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
+      dgram: dgramStub,
+      'tuyapi/lib/message-parser': { MessageParser: MessageParserStub },
+      'tuyapi/lib/config': { UDP_KEY: 'key' },
+    });
+
+    const clock = sinon.useFakeTimers();
+    const promise = localScan(1);
+
+    sockets.forEach((socket) => {
+      if (socket.handlers.message) {
+        socket.handlers.message(Buffer.from('test'));
+        socket.handlers.message(Buffer.from('test'));
+        socket.handlers.message(Buffer.from('test'));
+      }
+      if (socket.handlers.error) {
+        socket.handlers.error(new Error('boom'));
+      }
+    });
+
+    await clock.tickAsync(1100);
+    const result = await promise;
+    clock.restore();
+
+    expect(result).to.deep.equal({});
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.setValue.test.js b/server/test/services/tuya/lib/tuya.setValue.test.js
index 35449361ea..e2422a2d45 100644
--- a/server/test/services/tuya/lib/tuya.setValue.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.test.js
@@ -134,6 +134,125 @@ describe('TuyaHandler.setValue', () => {
     expect(ctx.connector.request.called).to.equal(false);
   });
 
+  it('should call local tuyapi with switch code', async () => {
+    const connect = sinon.stub().resolves();
+    const set = sinon.stub().resolves();
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.set = set;
+      this.disconnect = disconnect;
+    }
+    const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
+      tuyapi: TuyAPIStub,
+    });
+
+    const device = {
+      params: [
+        { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '10.0.0.2' },
+        { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+        { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.3' },
+        { name: DEVICE_PARAM_NAME.CLOUD_IP, value: '1.1.1.1' },
+        { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+      ],
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:switch',
+      category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+      type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub() },
+      gladys: {},
+    };
+
+    await setValue.call(ctx, device, deviceFeature, 1);
+
+    expect(connect.calledOnce).to.equal(true);
+    expect(set.calledOnce).to.equal(true);
+    expect(disconnect.calledOnce).to.equal(true);
+    expect(ctx.connector.request.called).to.equal(false);
+  });
+
+  it('should fallback to cloud when local override is false', async () => {
+    const connect = sinon.stub().resolves();
+    const set = sinon.stub().resolves();
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.set = set;
+      this.disconnect = disconnect;
+    }
+    const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
+      tuyapi: TuyAPIStub,
+    });
+
+    const device = {
+      params: [
+        { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '10.0.0.2' },
+        { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+        { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.3' },
+        { name: DEVICE_PARAM_NAME.CLOUD_IP, value: '10.0.0.2' },
+        { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: 'false' },
+      ],
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:switch_1',
+      category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+      type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub().resolves({}) },
+      gladys: {},
+    };
+
+    await setValue.call(ctx, device, deviceFeature, 1);
+
+    expect(connect.called).to.equal(false);
+    expect(ctx.connector.request.calledOnce).to.equal(true);
+  });
+
+  it('should fallback to cloud when dps is not mapped', async () => {
+    const connect = sinon.stub().resolves();
+    const set = sinon.stub().resolves();
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.set = set;
+      this.disconnect = disconnect;
+    }
+    const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
+      tuyapi: TuyAPIStub,
+    });
+
+    const device = {
+      params: [
+        { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '10.0.0.2' },
+        { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+        { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.3' },
+        { name: DEVICE_PARAM_NAME.CLOUD_IP, value: '1.1.1.1' },
+        { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+      ],
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:countdown',
+      category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+      type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub().resolves({}) },
+      gladys: {},
+    };
+
+    await setValue.call(ctx, device, deviceFeature, 1);
+
+    expect(connect.called).to.equal(false);
+    expect(ctx.connector.request.calledOnce).to.equal(true);
+  });
+
   it('should fallback to cloud when local call fails', async () => {
     const connect = sinon.stub().rejects(new Error('local error'));
     const set = sinon.stub().resolves();

From a3f83591c22f74701cc6bb45819dbca1baa9d8f6 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 15 Feb 2026 22:46:06 +0100
Subject: [PATCH 11/90] feat: ajouter des descriptions et des limitations pour
 la configuration Tuya dans les fichiers de langue

---
 front/src/config/i18n/de.json                             | 8 +++++++-
 front/src/config/i18n/en.json                             | 8 +++++++-
 front/src/config/i18n/fr.json                             | 8 +++++++-
 .../routes/integration/all/tuya/setup-page/SetupTab.jsx   | 6 ++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 0a2866e8f1..7cc99ee09b 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1200,12 +1200,18 @@
       },
       "setup": {
         "title": "Tuya-Konfiguration",
+        "cloudTitle": "<strong>Cloud</strong><br />",
         "description": "Du kannst Gladys mit deinem Tuya-Cloud-Account verbinden, um die zugehörigen Geräte zu steuern.",
         "descriptionCreateAccount": "Du musst einen Account bei <a href=\"https://www.tuya.com/\" target=\"_blank\" rel= \"noopener noreferrer\">Tuya</a> erstellen.",
         "descriptionCreateProject": "Danach musst du ein \"Cloud-Projekt\" in deinem Tuya-Account erstellen.",
-        "descriptionGetKeys": "Du erhältst Zugang zum Zugangsschlüssel und zum Geheimschlüssel.",
+        "descriptionGetKeys": "Du erhältst Zugang zur Client ID und zum Client Secret.",
         "descriptionGetAppAccountUid": "Um deine \"App Account UID\" zu erhalten, musst du zum Abschnitt \"Geräte\" -> \"Tuya App-Account verknüpfen\" gehen und einen Anwendungsaccount hinzufügen.",
         "descriptionGetAppAccountUid2": "Sobald das Hinzufügen abgeschlossen ist, findest du deine \"App Account UID\" in der UID-Spalte.",
+        "descriptionTrial": "Tuya-Cloud-Projekte haben eine Testphase: verlängere sie regelmäßig, um Unterbrechungen zu vermeiden.",
+        "localTitle": "<br /><strong>Lokal</strong><br />",
+        "descriptionLocalMode": "Der lokale Modus kann nach der Cloud-Konfiguration genutzt werden: Trage lokale IP und Protokollversion pro Gerät ein, um lokal abzufragen. Wenn die Geräte im selben Netzwerk wie der Gladys-Host sind, werden IP-Erkennung und Protokollversion automatisch erkannt. So kannst du die Cloud-Verlängerung umgehen, aber für das Hinzufügen neuer Geräte in der Tuya-App bleibt die Cloud nötig.",
+        "limitationsTitle": "<br /><strong>Aktuelle Einschränkungen</strong><br />",
+        "limitationsProtocol35": "Protokoll 3.5 wird lokal noch nicht unterstützt.",
         "endpoints": {
           "china": "China",
           "westernAmerica": "Westamerika",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index 56d7cc9737..d91cb57c20 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1095,12 +1095,18 @@
       },
       "setup": {
         "title": "Tuya configuration",
+        "cloudTitle": "<strong>Cloud</strong><br />",
         "description": "You can connect Gladys to your Tuya cloud account to control the related devices.",
         "descriptionCreateAccount": "You need to create an account at <a href=\"https://www.tuya.com/\" target=\"_blank\" rel= \"noopener noreferrer\">Tuya</a>.",
         "descriptionCreateProject": "You must then create a \"Cloud Project\" in your Tuya account.",
-        "descriptionGetKeys": "You will have access to the Access Key and the Secret Key.",
+        "descriptionGetKeys": "You will have access to the Client ID and the Client Secret.",
         "descriptionGetAppAccountUid": "To have your \"App account UID\", you must go to the \"Devices\" -> \"Link Tuya App Account\" section and add an application account.",
         "descriptionGetAppAccountUid2": "Once the addition is finalized, your \"App account UID\" will be in the UID column.",
+        "descriptionTrial": "Tuya Cloud projects have a trial period: make sure to renew or extend it regularly to avoid service interruptions.",
+        "localTitle": "<br /><strong>Local</strong><br />",
+        "descriptionLocalMode": "Local mode can be used after the cloud setup: provide the local IP and protocol version on each device to poll locally. If devices are on the same network as the Gladys machine, the IP discovery and protocol version are detected automatically. This lets you avoid renewing the cloud trial, but the cloud is still needed when you add a new device from the Tuya app.",
+        "limitationsTitle": "<br /><strong>Current limitations</strong><br />",
+        "limitationsProtocol35": "Protocol 3.5 is not yet supported locally.",
         "endpoints": {
           "china": "China",
           "westernAmerica": "Western America",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index ccab1d13a4..f1731886dc 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1330,12 +1330,18 @@
       },
       "setup": {
         "title": "Configuration Tuya",
+        "cloudTitle": "<strong>Cloud</strong><br />",
         "description": "Vous pouvez connecter Gladys à votre compte cloud Tuya pour commander les appareils associés.",
         "descriptionCreateAccount": "Vous avez besoin de créer un compte sur <a href=\"https://www.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya</a>.",
         "descriptionCreateProject": "Vous devez ensuite créer un \"Cloud Project\" dans votre compte Tuya.",
-        "descriptionGetKeys": "Vous aurez accès aux deux clés : Access Key et Secret Key.",
+        "descriptionGetKeys": "Vous aurez accès aux deux clés : Client ID et Client Secret.",
         "descriptionGetAppAccountUid": "Pour avoir votre \"App account UID\", il faut vous rendre dans la section \"Devices\" -> \"Link Tuya App Account\" et ajouter un compte d'application.",
         "descriptionGetAppAccountUid2": "Une fois que l'ajout est finalisé, votre \"App account UID\" sera dans la colonne UID.",
+        "descriptionTrial": "Les projets Tuya Cloud ont une période d'essai : pensez à la renouveler ou l'étendre régulièrement pour éviter les coupures.",
+        "localTitle": "<br /><strong>Local</strong><br />",
+        "descriptionLocalMode": "Le mode local peut être utilisé après la configuration cloud : renseignez l'IP locale et la version du protocole sur chaque appareil pour interroger en local. Si les appareils sont sur le même réseau que la machine Gladys, la découverte IP et la version du protocole sont automatiquement détectées. Ce mode permet de se passer du renouvellement cloud, mais il reste nécessaire lors de l'ajout d'un nouvel appareil depuis l'application Tuya.",
+        "limitationsTitle": "<br /><strong>Limites actuelles</strong><br />",
+        "limitationsProtocol35": "Le protocole 3.5 n'est pas encore pris en charge en local.",
         "endpoints": {
           "china": "China",
           "westernAmerica": "Western America",
diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 9276343c24..6a5cd69468 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -225,12 +225,18 @@ class SetupTab extends Component {
                 </div>
               )}
               <p>
+                <MarkupText id="integration.tuya.setup.cloudTitle" />
                 <MarkupText id="integration.tuya.setup.description" />
                 <MarkupText id="integration.tuya.setup.descriptionCreateAccount" />
                 <MarkupText id="integration.tuya.setup.descriptionCreateProject" />
                 <MarkupText id="integration.tuya.setup.descriptionGetKeys" />
                 <MarkupText id="integration.tuya.setup.descriptionGetAppAccountUid" />
                 <MarkupText id="integration.tuya.setup.descriptionGetAppAccountUid2" />
+                <MarkupText id="integration.tuya.setup.descriptionTrial" />
+                <MarkupText id="integration.tuya.setup.localTitle" />
+                <MarkupText id="integration.tuya.setup.descriptionLocalMode" />
+                <MarkupText id="integration.tuya.setup.limitationsTitle" />
+                <MarkupText id="integration.tuya.setup.limitationsProtocol35" />
               </p>
 
               <form>

From 50e112239777bcf7b165770f874055f286464cad Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 15 Feb 2026 23:08:40 +0100
Subject: [PATCH 12/90] =?UTF-8?q?feat:=20ajouter=20les=20champs=20Product?=
 =?UTF-8?q?=20ID=20et=20Product=20Key=20dans=20la=20configuration=20Tuya?=
 =?UTF-8?q?=20et=20mettre=20=C3=A0=20jour=20les=20traductions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/config/i18n/de.json                 |  8 ++---
 front/src/config/i18n/en.json                 |  8 ++---
 front/src/config/i18n/fr.json                 |  8 ++---
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 36 +++++++++++++++----
 server/services/tuya/api/tuya.controller.js   |  3 --
 .../services/tuya/lib/utils/tuya.constants.js |  1 -
 6 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 7cc99ee09b..321017f1cb 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1183,7 +1183,9 @@
         "localInfoHelp": "Gib die lokale IP und die Protokollversion ein, wenn du den lokalen Modus nutzen willst. Die Cloud-IP wird zur Referenz gespeichert.",
         "localPollButton": "Lokales DPS abfragen",
         "localPollSuccess": "Lokaler Poll OK.",
-        "localPollError": "Lokaler Poll fehlgeschlagen:"
+        "localPollError": "Lokaler Poll fehlgeschlagen:",
+        "productIdLabel": "Produkt-ID",
+        "productKeyLabel": "Product Key"
       },
       "discover": {
         "title": "In deinem Tuya-Cloud-Account erkannte Geräte",
@@ -1194,9 +1196,7 @@
         "udpScanError": "Fehler beim lokalen UDP-Scan.",
         "error": "Fehler beim Entdecken von Tuya-Geräten. Bitte überprüfe deine Login-Daten auf der Einrichtungsseite.",
         "noDeviceFound": "Kein Tuya-Gerät entdeckt.",
-        "scan": "Scannen",
-        "addSelected": "Auswahl hinzufügen",
-        "addSelectedError": "Fehler beim Hinzufügen der ausgewählten Geräte."
+        "scan": "Scannen"
       },
       "setup": {
         "title": "Tuya-Konfiguration",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index d91cb57c20..8b1cb742bd 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1078,7 +1078,9 @@
         "localInfoHelp": "Enter the local IP and protocol version if you want to use local mode. The cloud IP is kept for reference.",
         "localPollButton": "Poll local DPS",
         "localPollSuccess": "Local poll OK.",
-        "localPollError": "Local poll failed:"
+        "localPollError": "Local poll failed:",
+        "productIdLabel": "Product ID",
+        "productKeyLabel": "Product Key"
       },
       "discover": {
         "title": "Devices detected on your Tuya cloud account",
@@ -1089,9 +1091,7 @@
         "udpScanError": "Error while running local UDP scan.",
         "error": "Error discovering Tuya devices. Please verify your credentials on Setup.",
         "noDeviceFound": "No Tuya device discovered.",
-        "scan": "Scan",
-        "addSelected": "Add selected",
-        "addSelectedError": "Error adding selected devices."
+        "scan": "Scan"
       },
       "setup": {
         "title": "Tuya configuration",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index f1731886dc..6784c8e1fc 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1313,7 +1313,9 @@
         "localInfoHelp": "Saisissez l'IP locale et la version du protocole si vous souhaitez utiliser le mode local. L'IP cloud est conservée en référence.",
         "localPollButton": "Poll local des DP",
         "localPollSuccess": "Poll local OK.",
-        "localPollError": "Échec du poll local :"
+        "localPollError": "Échec du poll local :",
+        "productIdLabel": "Identifiant produit",
+        "productKeyLabel": "Product Key"
       },
       "discover": {
         "title": "Appareils détectés sur votre compte cloud Tuya",
@@ -1324,9 +1326,7 @@
         "udpScanError": "Erreur lors du scan UDP local.",
         "error": "Erreur de découverte des appareils Tuya. Veuillez vérifier vos informations d'identification lors de l'installation.",
         "noDeviceFound": "Aucun appareil Tuya n'a été découvert.",
-        "scan": "Scanner",
-        "addSelected": "Ajouter la sélection",
-        "addSelectedError": "Erreur lors de l'ajout des appareils sélectionnés."
+        "scan": "Scanner"
       },
       "setup": {
         "title": "Configuration Tuya",
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 306cdb62dc..9b3757473e 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -108,12 +108,6 @@ class TuyaDeviceBox extends Component {
           newParams.push({ name: 'PROTOCOL_VERSION', value: usedProtocol });
         }
       }
-      const existingIndex = newParams.findIndex(param => param.name === 'TUYA_DP_MAP');
-      if (existingIndex >= 0) {
-        newParams[existingIndex] = { ...newParams[existingIndex], value: JSON.stringify(result) };
-      } else {
-        newParams.push({ name: 'TUYA_DP_MAP', value: JSON.stringify(result) });
-      }
       this.setState({
         device: {
           ...this.state.device,
@@ -232,6 +226,8 @@ class TuyaDeviceBox extends Component {
     }, {});
     const deviceId = params.DEVICE_ID || (device.external_id ? device.external_id.split(':')[1] : '');
     const localKey = params.LOCAL_KEY || device.local_key || '';
+    const productId = params.PRODUCT_ID || device.product_id || '';
+    const productKey = params.PRODUCT_KEY || device.product_key || '';
     const protocolVersion = params.PROTOCOL_VERSION || device.protocol_version || '';
     const localOverride =
       params.LOCAL_OVERRIDE !== undefined && params.LOCAL_OVERRIDE !== null
@@ -315,6 +311,34 @@ class TuyaDeviceBox extends Component {
                   />
                 </div>
 
+                <div class="form-group">
+                  <label class="form-label" for={`product_id_${deviceIndex}`}>
+                    <Text id="integration.tuya.device.productIdLabel" />
+                  </label>
+                  <input
+                    id={`product_id_${deviceIndex}`}
+                    type="text"
+                    value={productId}
+                    class="form-control"
+                    disabled="true"
+                  />
+                </div>
+
+                {productKey && (
+                  <div class="form-group">
+                    <label class="form-label" for={`product_key_${deviceIndex}`}>
+                      <Text id="integration.tuya.device.productKeyLabel" />
+                    </label>
+                    <input
+                      id={`product_key_${deviceIndex}`}
+                      type="text"
+                      value={productKey}
+                      class="form-control"
+                      disabled="true"
+                    />
+                  </div>
+                )}
+
                 <div class="form-group">
                   <label class="form-label" for={`local_key_${deviceIndex}`}>
                     <Text id="integration.tuya.device.localKeyLabel" />
diff --git a/server/services/tuya/api/tuya.controller.js b/server/services/tuya/api/tuya.controller.js
index 4a8afa8a02..fe3db16544 100644
--- a/server/services/tuya/api/tuya.controller.js
+++ b/server/services/tuya/api/tuya.controller.js
@@ -35,12 +35,10 @@ module.exports = function TuyaController(tuyaManager) {
     updated.protocol_version = localInfo.version;
     updated.ip = localInfo.ip || updated.ip;
     updated.product_key = localInfo.productKey;
-    updated.local_override = true;
     updated.params = Array.isArray(updated.params) ? [...updated.params] : [];
     upsertParam(updated.params, DEVICE_PARAM_NAME.IP_ADDRESS, updated.ip);
     upsertParam(updated.params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, updated.protocol_version);
     upsertParam(updated.params, DEVICE_PARAM_NAME.PRODUCT_KEY, updated.product_key);
-    upsertParam(updated.params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE, true);
     return updated;
   }
   /**
@@ -79,7 +77,6 @@ module.exports = function TuyaController(tuyaManager) {
         upsertParam(device.params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, protocolVersion);
         upsertParam(device.params, DEVICE_PARAM_NAME.LOCAL_KEY, localKey);
         upsertParam(device.params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE, true);
-        upsertParam(device.params, DEVICE_PARAM_NAME.DP_MAP, JSON.stringify(result));
         upsertParam(device.params, DEVICE_PARAM_NAME.PRODUCT_ID, device.product_id);
         upsertParam(device.params, DEVICE_PARAM_NAME.PRODUCT_KEY, device.product_key);
 
diff --git a/server/services/tuya/lib/utils/tuya.constants.js b/server/services/tuya/lib/utils/tuya.constants.js
index 2463f70b80..8f032497a4 100644
--- a/server/services/tuya/lib/utils/tuya.constants.js
+++ b/server/services/tuya/lib/utils/tuya.constants.js
@@ -40,7 +40,6 @@ const DEVICE_PARAM_NAME = {
   PROTOCOL_VERSION: 'PROTOCOL_VERSION',
   CLOUD_IP: 'CLOUD_IP',
   LOCAL_OVERRIDE: 'LOCAL_OVERRIDE',
-  DP_MAP: 'TUYA_DP_MAP',
   PRODUCT_ID: 'PRODUCT_ID',
   PRODUCT_KEY: 'PRODUCT_KEY',
 };

From 513e2d05d94ec6f41bd1d198a177449da09026f5 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Mon, 16 Feb 2026 09:07:17 +0100
Subject: [PATCH 13/90] =?UTF-8?q?refactor:=20am=C3=A9liorer=20la=20journal?=
 =?UTF-8?q?isation=20dans=20le=20processus=20de=20scan=20local=20des=20app?=
 =?UTF-8?q?areils=20Tuya?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/services/tuya/api/tuya.controller.js   |  2 +
 server/services/tuya/lib/tuya.localScan.js    | 13 ++++--
 .../services/tuya/lib/tuya.localScan.test.js  | 44 +++++++++++++++++++
 3 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/server/services/tuya/api/tuya.controller.js b/server/services/tuya/api/tuya.controller.js
index fe3db16544..0458c029ad 100644
--- a/server/services/tuya/api/tuya.controller.js
+++ b/server/services/tuya/api/tuya.controller.js
@@ -1,4 +1,5 @@
 const asyncMiddleware = require('../../../api/middlewares/asyncMiddleware');
+const logger = require('../../../utils/logger');
 const { DEVICE_PARAM_NAME } = require('../lib/utils/tuya.constants');
 
 module.exports = function TuyaController(tuyaManager) {
@@ -103,6 +104,7 @@ module.exports = function TuyaController(tuyaManager) {
    */
   async function localScan(req, res) {
     const { timeoutSeconds } = req.body || {};
+    logger.info(`[Tuya][localScan] API request received (timeoutSeconds=${timeoutSeconds || 10})`);
     const localDevicesById = await tuyaManager.localScan(timeoutSeconds);
 
     if (Array.isArray(tuyaManager.discoveredDevices)) {
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index 249ae42f47..dae2342c59 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -16,7 +16,7 @@ async function localScan(timeoutSeconds = 10) {
   const devices = {};
   const sockets = [];
   const parser = new MessageParser({ key: UDP_KEY, version: 3.1 });
-  logger.debug(`[Tuya][localScan] Starting UDP scan for ${timeoutSeconds}s on ports ${DEFAULT_PORTS.join(', ')}`);
+  logger.info(`[Tuya][localScan] Starting UDP scan for ${timeoutSeconds}s on ports ${DEFAULT_PORTS.join(', ')}`);
 
   const onMessage = (message) => {
     let payload;
@@ -55,7 +55,14 @@ async function localScan(timeoutSeconds = 10) {
     socket.on('error', (err) => {
       logger.debug(`[Tuya][localScan] UDP socket error on port ${port}: ${err.message}`);
     });
-    socket.bind(port);
+    socket.bind(port, () => {
+      try {
+        const address = socket.address();
+        logger.info(`[Tuya][localScan] Listening on ${address.address}:${address.port}`);
+      } catch (e) {
+        logger.info(`[Tuya][localScan] Listening on port ${port}`);
+      }
+    });
     sockets.push(socket);
   });
 
@@ -71,7 +78,7 @@ async function localScan(timeoutSeconds = 10) {
     }
   });
 
-  logger.debug(`[Tuya][localScan] Scan complete. Found ${Object.keys(devices).length} device(s).`);
+  logger.info(`[Tuya][localScan] Scan complete. Found ${Object.keys(devices).length} device(s).`);
   return devices;
 }
 
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index 5d4c3b38af..7d989c6999 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -126,4 +126,48 @@ describe('TuyaHandler.localScan', () => {
 
     expect(result).to.deep.equal({});
   });
+
+  it('should handle socket address errors on bind', async () => {
+    const sockets = [];
+    const dgramStub = {
+      createSocket: () => {
+        const handlers = {};
+        const socket = {
+          on: (event, cb) => {
+            handlers[event] = cb;
+          },
+          bind: (port, cb) => {
+            if (cb) {
+              cb();
+            }
+          },
+          close: () => {},
+          address: () => {
+            throw new Error('address error');
+          },
+          handlers,
+        };
+        sockets.push(socket);
+        return socket;
+      },
+    };
+
+    class MessageParserStub {
+      parse() {
+        return [{ payload: null }];
+      }
+    }
+
+    const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
+      dgram: dgramStub,
+      'tuyapi/lib/message-parser': { MessageParser: MessageParserStub },
+      'tuyapi/lib/config': { UDP_KEY: 'key' },
+    });
+
+    const clock = sinon.useFakeTimers();
+    const promise = localScan(1);
+    await clock.tickAsync(1100);
+    await promise;
+    clock.restore();
+  });
 });

From 389d231c090107e49429f7cee84fe49180f8af6a Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Mon, 16 Feb 2026 09:14:07 +0100
Subject: [PATCH 14/90] logger

---
 server/services/tuya/lib/tuya.localScan.js | 37 ++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index dae2342c59..34b19e66f4 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -18,16 +18,46 @@ async function localScan(timeoutSeconds = 10) {
   const parser = new MessageParser({ key: UDP_KEY, version: 3.1 });
   logger.info(`[Tuya][localScan] Starting UDP scan for ${timeoutSeconds}s on ports ${DEFAULT_PORTS.join(', ')}`);
 
-  const onMessage = (message) => {
+  const formatHex = (buffer, maxLen = 128) => {
+    if (!buffer || !buffer.length) {
+      return '';
+    }
+    const slice = buffer.slice(0, maxLen);
+    return slice.toString('hex').match(/.{1,2}/g).join(' ');
+  };
+
+  const formatAscii = (buffer, maxLen = 256) => {
+    if (!buffer || !buffer.length) {
+      return '';
+    }
+    const slice = buffer.slice(0, maxLen);
+    return slice.toString('utf8').replace(/\s+/g, ' ').trim();
+  };
+
+  const onMessage = (message, rinfo) => {
     let payload;
+    const byteLen = message ? message.length : 0;
+    const remote = rinfo ? `${rinfo.address}:${rinfo.port}` : 'unknown';
+    logger.info(
+      `[Tuya][localScan] UDP packet received from ${remote} len=${byteLen} hex=${formatHex(message)} ascii="${formatAscii(
+        message,
+      )}"`,
+    );
     try {
       const parsed = parser.parse(message);
+      logger.info(`[Tuya][localScan] Parsed packet from ${remote}: ${JSON.stringify(parsed)}`);
       payload = parsed && parsed[0] && parsed[0].payload;
     } catch (e) {
+      logger.info(
+        `[Tuya][localScan] Unable to parse UDP payload from ${remote} (len=${byteLen}): ${e.message}`,
+      );
       return;
     }
 
     if (!payload || typeof payload !== 'object') {
+      logger.info(
+        `[Tuya][localScan] Ignoring UDP payload from ${remote} (len=${byteLen}): invalid payload`,
+      );
       return;
     }
 
@@ -35,6 +65,9 @@ async function localScan(timeoutSeconds = 10) {
     const deviceId = gwId || devId || id;
 
     if (!deviceId) {
+      logger.info(
+        `[Tuya][localScan] Ignoring UDP payload from ${remote} (len=${byteLen}): missing deviceId`,
+      );
       return;
     }
 
@@ -45,7 +78,7 @@ async function localScan(timeoutSeconds = 10) {
       productKey,
     };
     if (isNew) {
-      logger.debug(`[Tuya][localScan] Found device ${deviceId} ip=${ip || 'unknown'} version=${version || 'unknown'}`);
+      logger.info(`[Tuya][localScan] Found device ${deviceId} ip=${ip || 'unknown'} version=${version || 'unknown'}`);
     }
   };
 

From 36dfd9160382a884df797979183a75b23d8f9dc6 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Mon, 16 Feb 2026 10:52:24 +0100
Subject: [PATCH 15/90] =?UTF-8?q?refactor:=20am=C3=A9liorer=20la=20gestion?=
 =?UTF-8?q?=20des=20erreurs=20du=20socket=20UDP=20dans=20le=20scan=20local?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/services/tuya/lib/tuya.localScan.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index 34b19e66f4..8d84e68c85 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -86,9 +86,9 @@ async function localScan(timeoutSeconds = 10) {
     const socket = dgram.createSocket({ type: 'udp4', reuseAddr: true });
     socket.on('message', onMessage);
     socket.on('error', (err) => {
-      logger.debug(`[Tuya][localScan] UDP socket error on port ${port}: ${err.message}`);
+      logger.info(`[Tuya][localScan] UDP socket error on port ${port}: ${err.message}`);
     });
-    socket.bind(port, () => {
+    socket.on('listening', () => {
       try {
         const address = socket.address();
         logger.info(`[Tuya][localScan] Listening on ${address.address}:${address.port}`);
@@ -96,6 +96,7 @@ async function localScan(timeoutSeconds = 10) {
         logger.info(`[Tuya][localScan] Listening on port ${port}`);
       }
     });
+    socket.bind(port);
     sockets.push(socket);
   });
 

From b8e1a9f8739a59ade35dfff21ed78ea9f0b1a775 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Mon, 16 Feb 2026 11:02:44 +0100
Subject: [PATCH 16/90] =?UTF-8?q?refactor:=20mettre=20=C3=A0=20jour=20la?=
 =?UTF-8?q?=20m=C3=A9thode=20de=20liaison=20des=20sockets=20pour=20permett?=
 =?UTF-8?q?re=20l'utilisation=20d'adresses=20sp=C3=A9cifiques?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/services/tuya/lib/tuya.localScan.js       |  2 +-
 .../services/tuya/lib/tuya.localScan.test.js     | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index 8d84e68c85..362c490171 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -96,7 +96,7 @@ async function localScan(timeoutSeconds = 10) {
         logger.info(`[Tuya][localScan] Listening on port ${port}`);
       }
     });
-    socket.bind(port);
+    socket.bind({ port, address: '0.0.0.0', exclusive: false });
     sockets.push(socket);
   });
 
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index 7d989c6999..7de5c2739e 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -13,7 +13,15 @@ describe('TuyaHandler.localScan', () => {
           on: (event, cb) => {
             handlers[event] = cb;
           },
-          bind: () => {},
+          bind: (options, cb) => {
+            if (typeof options === 'function') {
+              options();
+              return;
+            }
+            if (cb) {
+              cb();
+            }
+          },
           close: () => {},
           handlers,
         };
@@ -136,7 +144,11 @@ describe('TuyaHandler.localScan', () => {
           on: (event, cb) => {
             handlers[event] = cb;
           },
-          bind: (port, cb) => {
+          bind: (options, cb) => {
+            if (typeof options === 'function') {
+              options();
+              return;
+            }
             if (cb) {
               cb();
             }

From 8d2536f90c949a79a449b9dbebbd721b80d6792a Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Mon, 16 Feb 2026 12:12:03 +0100
Subject: [PATCH 17/90] =?UTF-8?q?feat:=20am=C3=A9liorer=20le=20scan=20loca?=
 =?UTF-8?q?l=20des=20appareils=20Tuya=20avec=20gestion=20des=20erreurs=20d?=
 =?UTF-8?q?e=20port=20et=20mise=20=C3=A0=20jour=20des=20traductions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/config/i18n/de.json                 |  4 +-
 front/src/config/i18n/en.json                 |  4 +-
 front/src/config/i18n/fr.json                 |  4 +-
 .../all/tuya/discover-page/DiscoverTab.jsx    | 42 +++++++++---
 server/services/tuya/api/tuya.controller.js   |  8 ++-
 server/services/tuya/lib/tuya.localPoll.js    | 68 +++++++++++++++----
 server/services/tuya/lib/tuya.localScan.js    | 63 +++++++++--------
 7 files changed, 135 insertions(+), 58 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 321017f1cb..d359aa3ecb 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1192,8 +1192,10 @@
         "description": "Tuya-Geräte werden automatisch erkannt. Deine Tuya-Geräte müssen zuerst zu deinem Tuya-Cloud-Account hinzugefügt werden.",
         "localDiscoveryInfo": "Lokale Erkennung nutzt UDP-Broadcast. Starte den lokalen UDP-Scan und gib bei Bedarf lokale IP und Protokollversion ein und nutze \"Lokales DPS abfragen\".",
         "scanInProgress": "Scan läuft... Cloud-Geräte werden abgerufen.",
-        "udpScan": "Lokalen UDP-Scan starten",
+        "scanCloud": "Cloud-Scan",
+        "localScanAuto": "Lokaler Auto-Scan",
         "udpScanError": "Fehler beim lokalen UDP-Scan.",
+        "udpScanPortInUse": "Auf den Ports {{ports}} kann nicht gelauscht werden (bereits belegt). Beende Dienste auf diesen Ports und starte den Scan erneut.",
         "error": "Fehler beim Entdecken von Tuya-Geräten. Bitte überprüfe deine Login-Daten auf der Einrichtungsseite.",
         "noDeviceFound": "Kein Tuya-Gerät entdeckt.",
         "scan": "Scannen"
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index 8b1cb742bd..97507def62 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1087,8 +1087,10 @@
         "description": "Tuya devices are automatically discovered. Your Tuya devices need to be added to your Tuya cloud account before.",
         "localDiscoveryInfo": "Local discovery uses UDP broadcast. Run the local UDP scan, then if needed enter the local IP and protocol version and use \"Poll local DPS\".",
         "scanInProgress": "Scan in progress... retrieving cloud devices.",
-        "udpScan": "Run local UDP scan",
+        "scanCloud": "Cloud Scan",
+        "localScanAuto": "Auto local scan",
         "udpScanError": "Error while running local UDP scan.",
+        "udpScanPortInUse": "Unable to listen on ports {{ports}} (already in use). Stop services using these ports and run the scan again.",
         "error": "Error discovering Tuya devices. Please verify your credentials on Setup.",
         "noDeviceFound": "No Tuya device discovered.",
         "scan": "Scan"
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index 6784c8e1fc..4d471decce 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1322,8 +1322,10 @@
         "description": "Les appareils Tuya sont automatiquement découverts. Vos appareils Tuya doivent être ajoutés à votre compte cloud Tuya avant.",
         "localDiscoveryInfo": "La découverte locale utilise le broadcast UDP. Lancez le scan UDP local puis, si besoin, renseignez l'IP locale et la version du protocole, et utilisez \"Poll local des DP\".",
         "scanInProgress": "Scan en cours... récupération cloud des appareils.",
-        "udpScan": "Scanner UDP local",
+        "scanCloud": "Scan Cloud",
+        "localScanAuto": "Scan local auto",
         "udpScanError": "Erreur lors du scan UDP local.",
+        "udpScanPortInUse": "Impossible d'écouter sur les ports {{ports}} (déjà utilisés). Fermez les services qui écoutent sur ces ports puis relancez le scan.",
         "error": "Erreur de découverte des appareils Tuya. Veuillez vérifier vos informations d'identification lors de l'installation.",
         "noDeviceFound": "Aucun appareil Tuya n'a été découvert.",
         "scan": "Scanner"
diff --git a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
index 31653696a4..c1f3f3c3cc 100644
--- a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
+++ b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
@@ -1,4 +1,4 @@
-import { Text } from 'preact-i18n';
+import { Text, Localizer } from 'preact-i18n';
 import { Link } from 'preact-router/match';
 import cx from 'classnames';
 
@@ -57,10 +57,13 @@ class DiscoverTab extends Component {
   runLocalScan = async () => {
     this.setState({
       udpScanLoading: true,
-      udpScanError: false
+      udpScanError: false,
+      udpScanPortErrors: null
     });
     try {
-      const response = await this.props.httpClient.post('/api/v1/service/tuya/local-scan', { timeoutSeconds: 10 });
+      const response = await this.props.httpClient.post('/api/v1/service/tuya/local-scan', {
+        timeoutSeconds: 10
+      });
       if (response && response.devices) {
         this.setState({
           discoveredDevices: response.devices
@@ -69,7 +72,8 @@ class DiscoverTab extends Component {
         await this.getDiscoveredDevices();
       }
       this.setState({
-        udpScanLoading: false
+        udpScanLoading: false,
+        udpScanPortErrors: response && response.port_errors ? response.port_errors : null
       });
     } catch (e) {
       this.setState({
@@ -79,7 +83,12 @@ class DiscoverTab extends Component {
     }
   };
 
-  render(props, { loading, errorLoading, discoveredDevices, housesWithRooms, udpScanLoading, udpScanError }) {
+  render(
+    props,
+    { loading, errorLoading, discoveredDevices, housesWithRooms, udpScanLoading, udpScanError, udpScanPortErrors }
+  ) {
+    const canScanCloud = !errorLoading;
+    const portErrorPorts = udpScanPortErrors ? Object.keys(udpScanPortErrors) : [];
     return (
       <div class="card">
         <div class="card-header">
@@ -87,15 +96,19 @@ class DiscoverTab extends Component {
             <Text id="integration.tuya.discover.title" />
           </h1>
           <div class="page-options d-flex">
-            <button onClick={this.getDiscoveredDevices} class="btn btn-outline-primary ml-2" disabled={loading}>
-              <Text id="integration.tuya.discover.scan" /> <i class="fe fe-radio" />
+            <button
+              onClick={this.getDiscoveredDevices}
+              class="btn btn-outline-primary ml-2"
+              disabled={loading || !canScanCloud}
+            >
+              <Text id="integration.tuya.discover.scanCloud" /> <i class="fe fe-radio" />
             </button>
             <button
               onClick={this.runLocalScan}
               class="btn btn-outline-success ml-2"
               disabled={loading || udpScanLoading}
             >
-              <Text id="integration.tuya.discover.udpScan" />
+              <Text id="integration.tuya.discover.localScanAuto" />
             </button>
           </div>
         </div>
@@ -116,6 +129,19 @@ class DiscoverTab extends Component {
               <Text id="integration.tuya.discover.udpScanError" />
             </div>
           )}
+          {portErrorPorts.length > 0 && (
+            <div class="alert alert-warning">
+              <Localizer>
+                {localizer => (
+                  <span>
+                    {localizer.t('integration.tuya.discover.udpScanPortInUse', {
+                      ports: portErrorPorts.join(', ')
+                    })}
+                  </span>
+                )}
+              </Localizer>
+            </div>
+          )}
           <div
             class={cx('dimmer', {
               active: loading || udpScanLoading
diff --git a/server/services/tuya/api/tuya.controller.js b/server/services/tuya/api/tuya.controller.js
index 0458c029ad..ca4e4995fa 100644
--- a/server/services/tuya/api/tuya.controller.js
+++ b/server/services/tuya/api/tuya.controller.js
@@ -105,7 +105,11 @@ module.exports = function TuyaController(tuyaManager) {
   async function localScan(req, res) {
     const { timeoutSeconds } = req.body || {};
     logger.info(`[Tuya][localScan] API request received (timeoutSeconds=${timeoutSeconds || 10})`);
-    const localDevicesById = await tuyaManager.localScan(timeoutSeconds);
+    const localScanResult = await tuyaManager.localScan({
+      timeoutSeconds,
+    });
+    const localDevicesById = localScanResult.devices || {};
+    const portErrors = localScanResult.portErrors || {};
 
     if (Array.isArray(tuyaManager.discoveredDevices)) {
       const updatedDevices = tuyaManager.discoveredDevices.map((device) => {
@@ -117,12 +121,14 @@ module.exports = function TuyaController(tuyaManager) {
       res.json({
         devices: updatedDevices,
         local_devices: localDevicesById,
+        port_errors: portErrors,
       });
       return;
     }
 
     res.json({
       local_devices: localDevicesById,
+      port_errors: portErrors,
     });
   }
 
diff --git a/server/services/tuya/lib/tuya.localPoll.js b/server/services/tuya/lib/tuya.localPoll.js
index 1087b2c47e..7dc4c8279f 100644
--- a/server/services/tuya/lib/tuya.localPoll.js
+++ b/server/services/tuya/lib/tuya.localPoll.js
@@ -10,8 +10,8 @@ const { BadParameters } = require('../../../utils/coreErrors');
  * await localPoll({ deviceId: 'id', ip: '1.1.1.1', localKey: 'key', protocolVersion: '3.3' });
  */
 async function localPoll(payload) {
-  const { deviceId, ip, localKey, protocolVersion, timeoutMs = 8000 } = payload || {};
-  const effectiveTimeout = protocolVersion === '3.5' ? Math.max(timeoutMs, 15000) : timeoutMs;
+  const { deviceId, ip, localKey, protocolVersion, timeoutMs = 8000, fastScan = false } = payload || {};
+  const effectiveTimeout = protocolVersion === '3.5' && !fastScan ? Math.max(timeoutMs, 15000) : timeoutMs;
 
   if (!deviceId || !ip || !localKey || !protocolVersion) {
     throw new BadParameters('Missing local connection parameters');
@@ -23,21 +23,58 @@ async function localPoll(payload) {
     ip,
     version: protocolVersion,
   });
+  let lastError = null;
+  const onError = (err) => {
+    lastError = err;
+    logger.info(`[Tuya][localPoll] socket error for device=${deviceId}: ${err.message}`);
+  };
+  tuyaLocal.on('error', onError);
 
   const runGet = async (options) => {
-    const operation = (async () => {
-      await tuyaLocal.connect();
-      const data = await tuyaLocal.get(options);
+    let errorListener;
+    let timeoutId;
+    let resolved = false;
+    const cleanup = async () => {
+      if (resolved) {
+        return;
+      }
+      resolved = true;
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+      if (errorListener) {
+        tuyaLocal.removeListener('error', errorListener);
+      }
+      try {
+        await tuyaLocal.disconnect();
+      } catch (err) {
+        // ignore
+      }
+    };
+    try {
+      const operation = (async () => {
+        await tuyaLocal.connect();
+        const data = await tuyaLocal.get(options);
+        return data;
+      })();
+      const data = await Promise.race([
+        operation,
+        new Promise((_, reject) => {
+          timeoutId = setTimeout(() => reject(new BadParameters('Local poll timeout')), effectiveTimeout);
+        }),
+        new Promise((_, reject) => {
+          errorListener = (err) => {
+            reject(new BadParameters(`Local poll socket error: ${err.message}`));
+          };
+          tuyaLocal.once('error', errorListener);
+        }),
+      ]);
+      await cleanup();
       return data;
-    })();
-    const data = await Promise.race([
-      operation,
-      new Promise((_, reject) => {
-        setTimeout(() => reject(new BadParameters('Local poll timeout')), effectiveTimeout);
-      }),
-    ]);
-    await tuyaLocal.disconnect();
-    return data;
+    } catch (e) {
+      await cleanup();
+      throw e;
+    }
   };
 
   try {
@@ -62,6 +99,9 @@ async function localPoll(payload) {
     logger.debug(`[Tuya][localPoll] device=${deviceId} dps=${JSON.stringify(data)}`);
     return data;
   } catch (e) {
+    if (lastError && (!e || e.message !== lastError.message)) {
+      logger.info(`[Tuya][localPoll] last socket error for device=${deviceId}: ${lastError.message}`);
+    }
     logger.warn(`[Tuya][localPoll] failed for device=${deviceId}`, e);
     try {
       await tuyaLocal.disconnect();
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index 362c490171..abc0723114 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -4,60 +4,60 @@ const { MessageParser } = require('tuyapi/lib/message-parser');
 const logger = require('../../../utils/logger');
 
 const DEFAULT_PORTS = [6666, 6667, 7000];
+const formatHex = (buffer, maxLen = 128) => {
+  if (!buffer || !buffer.length) {
+    return '';
+  }
+  const slice = buffer.slice(0, maxLen);
+  return slice.toString('hex').match(/.{1,2}/g).join(' ');
+};
+
+const formatAscii = (buffer, maxLen = 256) => {
+  if (!buffer || !buffer.length) {
+    return '';
+  }
+  const slice = buffer.slice(0, maxLen);
+  return slice.toString('utf8').replace(/\s+/g, ' ').trim();
+};
 
 /**
- * @description Scan local network for Tuya devices over UDP to retrieve protocol version.
- * @param {number} timeoutSeconds - Scan duration in seconds.
+ * @description Scan local network for Tuya devices (UDP broadcast).
+ * @param {number|object} input - Scan duration in seconds or options.
  * @returns {Promise<object>} Map of deviceId -> { ip, version, productKey }.
  * @example
- * await localScan(5);
+ * await localScan({ timeoutSeconds: 10 });
  */
-async function localScan(timeoutSeconds = 10) {
+async function localScan(input = 10) {
+  const options = typeof input === 'object' ? input || {} : { timeoutSeconds: input };
+  const timeoutSeconds = options.timeoutSeconds || 10;
   const devices = {};
+  const portErrors = {};
   const sockets = [];
   const parser = new MessageParser({ key: UDP_KEY, version: 3.1 });
-  logger.info(`[Tuya][localScan] Starting UDP scan for ${timeoutSeconds}s on ports ${DEFAULT_PORTS.join(', ')}`);
-
-  const formatHex = (buffer, maxLen = 128) => {
-    if (!buffer || !buffer.length) {
-      return '';
-    }
-    const slice = buffer.slice(0, maxLen);
-    return slice.toString('hex').match(/.{1,2}/g).join(' ');
-  };
 
-  const formatAscii = (buffer, maxLen = 256) => {
-    if (!buffer || !buffer.length) {
-      return '';
-    }
-    const slice = buffer.slice(0, maxLen);
-    return slice.toString('utf8').replace(/\s+/g, ' ').trim();
-  };
+  logger.info(`[Tuya][localScan] Starting udp scan for ${timeoutSeconds}s on ports ${DEFAULT_PORTS.join(', ')}`);
 
   const onMessage = (message, rinfo) => {
     let payload;
     const byteLen = message ? message.length : 0;
     const remote = rinfo ? `${rinfo.address}:${rinfo.port}` : 'unknown';
+    const source = rinfo && rinfo.source ? rinfo.source : 'udp';
     logger.info(
-      `[Tuya][localScan] UDP packet received from ${remote} len=${byteLen} hex=${formatHex(message)} ascii="${formatAscii(
+      `[Tuya][localScan] Packet received (${source}) from ${remote} len=${byteLen} hex=${formatHex(
         message,
-      )}"`,
+      )} ascii="${formatAscii(message)}"`,
     );
     try {
       const parsed = parser.parse(message);
       logger.info(`[Tuya][localScan] Parsed packet from ${remote}: ${JSON.stringify(parsed)}`);
       payload = parsed && parsed[0] && parsed[0].payload;
     } catch (e) {
-      logger.info(
-        `[Tuya][localScan] Unable to parse UDP payload from ${remote} (len=${byteLen}): ${e.message}`,
-      );
+      logger.info(`[Tuya][localScan] Unable to parse payload from ${remote} (len=${byteLen}): ${e.message}`);
       return;
     }
 
     if (!payload || typeof payload !== 'object') {
-      logger.info(
-        `[Tuya][localScan] Ignoring UDP payload from ${remote} (len=${byteLen}): invalid payload`,
-      );
+      logger.info(`[Tuya][localScan] Ignoring payload from ${remote} (len=${byteLen}): invalid payload`);
       return;
     }
 
@@ -65,9 +65,7 @@ async function localScan(timeoutSeconds = 10) {
     const deviceId = gwId || devId || id;
 
     if (!deviceId) {
-      logger.info(
-        `[Tuya][localScan] Ignoring UDP payload from ${remote} (len=${byteLen}): missing deviceId`,
-      );
+      logger.info(`[Tuya][localScan] Ignoring payload from ${remote} (len=${byteLen}): missing deviceId`);
       return;
     }
 
@@ -86,6 +84,7 @@ async function localScan(timeoutSeconds = 10) {
     const socket = dgram.createSocket({ type: 'udp4', reuseAddr: true });
     socket.on('message', onMessage);
     socket.on('error', (err) => {
+      portErrors[port] = err && err.message ? err.message : 'unknown';
       logger.info(`[Tuya][localScan] UDP socket error on port ${port}: ${err.message}`);
     });
     socket.on('listening', () => {
@@ -113,7 +112,7 @@ async function localScan(timeoutSeconds = 10) {
   });
 
   logger.info(`[Tuya][localScan] Scan complete. Found ${Object.keys(devices).length} device(s).`);
-  return devices;
+  return { devices, portErrors };
 }
 
 module.exports = {

From a0243b65023b863d22338893c9d53237ed4bad71 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Mon, 16 Feb 2026 12:40:12 +0100
Subject: [PATCH 18/90] =?UTF-8?q?feat:=20mettre=20=C3=A0=20jour=20les=20de?=
 =?UTF-8?q?scriptions=20de=20configuration=20Tuya=20pour=20inclure=20des?=
 =?UTF-8?q?=20liens=20vers=20la=20documentation=20et=20les=20options=20de?=
 =?UTF-8?q?=20connexion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/config/i18n/de.json | 10 +++++-----
 front/src/config/i18n/en.json | 10 +++++-----
 front/src/config/i18n/fr.json | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index d359aa3ecb..7d85d24678 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1203,9 +1203,9 @@
       "setup": {
         "title": "Tuya-Konfiguration",
         "cloudTitle": "<strong>Cloud</strong><br />",
-        "description": "Du kannst Gladys mit deinem Tuya-Cloud-Account verbinden, um die zugehörigen Geräte zu steuern.",
-        "descriptionCreateAccount": "Du musst einen Account bei <a href=\"https://www.tuya.com/\" target=\"_blank\" rel= \"noopener noreferrer\">Tuya</a> erstellen.",
-        "descriptionCreateProject": "Danach musst du ein \"Cloud-Projekt\" in deinem Tuya-Account erstellen.",
+        "description": "Du kannst Gladys mit deinem Tuya-Cloud-Account verbinden, um die zugehörigen Geräte zu steuern. Die Dokumentation findest du im linken Menü oder <a href=\"https://gladysassistant.com/de/docs/integrations/tuya\" target=\"_blank\" rel=\"noopener noreferrer\">hier</a>.",
+        "descriptionCreateAccount": "Du musst einen Account bei <a href=\"https://www.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya</a> erstellen (<a href=\"https://auth.tuya.com/register\" target=\"_blank\" rel=\"noopener noreferrer\">Registrieren</a> / <a href=\"https://auth.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Anmelden</a>).",
+        "descriptionCreateProject": "Danach musst du ein \"Cloud-Projekt\" in deinem Tuya-Account erstellen (Konsole: <a href=\"https://platform.tuya.com/cloud\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Platform</a>).",
         "descriptionGetKeys": "Du erhältst Zugang zur Client ID und zum Client Secret.",
         "descriptionGetAppAccountUid": "Um deine \"App Account UID\" zu erhalten, musst du zum Abschnitt \"Geräte\" -> \"Tuya App-Account verknüpfen\" gehen und einen Anwendungsaccount hinzufügen.",
         "descriptionGetAppAccountUid2": "Sobald das Hinzufügen abgeschlossen ist, findest du deine \"App Account UID\" in der UID-Spalte.",
@@ -1229,8 +1229,8 @@
         "secretKeyPlaceholder": "Tuya Client Secret eingeben",
         "appAccountId": "App Account User ID",
         "appAccountIdPlaceholder": "Tuya App User ID eingeben",
-        "appUsername": "App Username",
-        "appUsernamePlaceholder": "Tuya App Username eingeben",
+        "appUsername": "Smart Life Benutzername (optional)",
+        "appUsernamePlaceholder": "Smart Life Konto E-Mail oder Telefon",
         "saveLabel": "Konfiguration sichern",
         "error": "Beim Sichern der Konfiguration ist ein Fehler aufgetreten.",
         "connecting": "Konfiguration gesichert. Die Verbindung mit deinem Tuya-Cloud-Account wird jetzt hergestellt …",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index 97507def62..71c1883a8d 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1098,9 +1098,9 @@
       "setup": {
         "title": "Tuya configuration",
         "cloudTitle": "<strong>Cloud</strong><br />",
-        "description": "You can connect Gladys to your Tuya cloud account to control the related devices.",
-        "descriptionCreateAccount": "You need to create an account at <a href=\"https://www.tuya.com/\" target=\"_blank\" rel= \"noopener noreferrer\">Tuya</a>.",
-        "descriptionCreateProject": "You must then create a \"Cloud Project\" in your Tuya account.",
+        "description": "You can connect Gladys to your Tuya cloud account to control the related devices. Documentation is available in the left menu or <a href=\"https://gladysassistant.com/en/docs/integrations/tuya\" target=\"_blank\" rel=\"noopener noreferrer\">here</a>.",
+        "descriptionCreateAccount": "You need to create an account at <a href=\"https://www.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya</a> (<a href=\"https://auth.tuya.com/register\" target=\"_blank\" rel=\"noopener noreferrer\">Sign up</a> / <a href=\"https://auth.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Log in</a>).",
+        "descriptionCreateProject": "You must then create a \"Cloud Project\" in your Tuya account (console: <a href=\"https://platform.tuya.com/cloud\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Platform</a>).",
         "descriptionGetKeys": "You will have access to the Client ID and the Client Secret.",
         "descriptionGetAppAccountUid": "To have your \"App account UID\", you must go to the \"Devices\" -> \"Link Tuya App Account\" section and add an application account.",
         "descriptionGetAppAccountUid2": "Once the addition is finalized, your \"App account UID\" will be in the UID column.",
@@ -1124,8 +1124,8 @@
         "secretKeyPlaceholder": "Enter Tuya Client Secret",
         "appAccountId": "App account User ID",
         "appAccountIdPlaceholder": "Enter Tuya app User ID",
-        "appUsername": "App Username",
-        "appUsernamePlaceholder": "Enter Tuya app Username",
+        "appUsername": "Smart Life username (optional)",
+        "appUsernamePlaceholder": "Smart Life account email or phone",
         "saveLabel": "Save configuration",
         "error": "An error occurred while saving configuration.",
         "connecting": "Configuration saved. Now connecting to your Tuya cloud account...",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index 4d471decce..4edeff3847 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1333,9 +1333,9 @@
       "setup": {
         "title": "Configuration Tuya",
         "cloudTitle": "<strong>Cloud</strong><br />",
-        "description": "Vous pouvez connecter Gladys à votre compte cloud Tuya pour commander les appareils associés.",
-        "descriptionCreateAccount": "Vous avez besoin de créer un compte sur <a href=\"https://www.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya</a>.",
-        "descriptionCreateProject": "Vous devez ensuite créer un \"Cloud Project\" dans votre compte Tuya.",
+        "description": "Vous pouvez connecter Gladys à votre compte cloud Tuya pour commander les appareils associés. La documentation est disponible dans le menu de gauche ou <a href=\"https://gladysassistant.com/fr/docs/integrations/tuya\" target=\"_blank\" rel=\"noopener noreferrer\">ici</a>.",
+        "descriptionCreateAccount": "Vous avez besoin de créer un compte sur <a href=\"https://www.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya</a> (<a href=\"https://auth.tuya.com/register\" target=\"_blank\" rel=\"noopener noreferrer\">Créer un compte</a> / <a href=\"https://auth.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Se connecter</a>).",
+        "descriptionCreateProject": "Vous devez ensuite créer un \"Cloud Project\" dans votre compte Tuya (console : <a href=\"https://platform.tuya.com/cloud\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Platform</a>).",
         "descriptionGetKeys": "Vous aurez accès aux deux clés : Client ID et Client Secret.",
         "descriptionGetAppAccountUid": "Pour avoir votre \"App account UID\", il faut vous rendre dans la section \"Devices\" -> \"Link Tuya App Account\" et ajouter un compte d'application.",
         "descriptionGetAppAccountUid2": "Une fois que l'ajout est finalisé, votre \"App account UID\" sera dans la colonne UID.",
@@ -1359,8 +1359,8 @@
         "secretKeyPlaceholder": "Entrez le 'Client Secret' de Tuya",
         "appAccountId": "App account User ID",
         "appAccountIdPlaceholder": "Entrez l'UID de l'app de Tuya",
-        "appUsername": "App Username",
-        "appUsernamePlaceholder": "Entrez le Username de l'app de Tuya",
+        "appUsername": "Identifiant Smart Life (optionnel)",
+        "appUsernamePlaceholder": "Email ou téléphone du compte Smart Life",
         "saveLabel": "Enregistrer la configuration",
         "error": "Une erreur s'est produite lors de la sauvegarde de la configuration.",
         "connecting": "Configuration sauvegardée. Connexion à votre compte cloud Tuya...",

From 70c7d4a1e6be598736af353189becd2ec169e60b Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Tue, 17 Feb 2026 05:13:21 +0100
Subject: [PATCH 19/90] =?UTF-8?q?feat:=20ajouter=20des=20messages=20d'info?=
 =?UTF-8?q?rmation=20sur=20le=20protocole=203.5=20et=20la=20cr=C3=A9ation?=
 =?UTF-8?q?=20de=20rapports=20GitHub=20pour=20les=20appareils=20Tuya?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/config/i18n/de.json                 |  2 +
 front/src/config/i18n/en.json                 |  2 +
 front/src/config/i18n/fr.json                 |  2 +
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 82 ++++++++++++++++++-
 4 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 7d85d24678..bedb82c2e3 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1184,6 +1184,8 @@
         "localPollButton": "Lokales DPS abfragen",
         "localPollSuccess": "Lokaler Poll OK.",
         "localPollError": "Lokaler Poll fehlgeschlagen:",
+        "protocol35Unsupported": "Protokoll 3.5 wird lokal noch nicht unterstützt.",
+        "githubIssueInfo": "Ein Bericht wird mit den Gerätedetails gesendet. Sensible Daten (Local Key und IP) werden maskiert.",
         "productIdLabel": "Produkt-ID",
         "productKeyLabel": "Product Key"
       },
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index 71c1883a8d..2c19985dad 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1079,6 +1079,8 @@
         "localPollButton": "Poll local DPS",
         "localPollSuccess": "Local poll OK.",
         "localPollError": "Local poll failed:",
+        "protocol35Unsupported": "Protocol 3.5 is not supported locally yet.",
+        "githubIssueInfo": "A report will be sent with the device details. Sensitive data (local key and IP) is masked.",
         "productIdLabel": "Product ID",
         "productKeyLabel": "Product Key"
       },
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index 4edeff3847..c92432de14 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1314,6 +1314,8 @@
         "localPollButton": "Poll local des DP",
         "localPollSuccess": "Poll local OK.",
         "localPollError": "Échec du poll local :",
+        "protocol35Unsupported": "Le protocole 3.5 n'est pas pris en charge en local pour le moment.",
+        "githubIssueInfo": "Un rapport sera envoyé avec les informations du périphérique. Les données sensibles (clé locale et IP) sont masquées.",
         "productIdLabel": "Identifiant produit",
         "productKeyLabel": "Product Key"
       },
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 9b3757473e..22350d1a72 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -7,6 +7,57 @@ import DeviceFeatures from '../../../../components/device/view/DeviceFeatures';
 import { connect } from 'unistore/preact';
 import { RequestStatus } from '../../../../utils/consts';
 
+const GITHUB_BASE_URL = 'https://github.com/GladysAssistant/Gladys/issues/new';
+
+const maskIp = ip => {
+  if (!ip || typeof ip !== 'string') {
+    return null;
+  }
+  const parts = ip.split('.');
+  if (parts.length !== 4 || parts.some(part => part === '' || Number.isNaN(parseInt(part, 10)))) {
+    return null;
+  }
+  return `${parts[0]}.${parts[1]}.x.x`;
+};
+
+const sanitizeParams = params => {
+  if (!Array.isArray(params)) {
+    return [];
+  }
+  return params.map(param => {
+    if (param.name === 'LOCAL_KEY') {
+      return { ...param, value: '***' };
+    }
+    if (param.name === 'IP_ADDRESS' || param.name === 'CLOUD_IP') {
+      return { ...param, value: maskIp(param.value) };
+    }
+    return param;
+  });
+};
+
+const buildIssuePayload = (device, localPollStatus, localPollError) => {
+  const sanitized = { ...device };
+  delete sanitized.local_key;
+  delete sanitized.ip;
+  delete sanitized.cloud_ip;
+  if (Array.isArray(sanitized.params)) {
+    sanitized.params = sanitizeParams(sanitized.params);
+  }
+  sanitized.local_poll = {
+    status: localPollStatus,
+    error: localPollError || null
+  };
+  sanitized.local_ip_masked = maskIp(device.ip);
+  sanitized.cloud_ip_masked = maskIp(device.cloud_ip);
+  return sanitized;
+};
+
+const createGithubUrl = (device, localPollStatus, localPollError) => {
+  const title = encodeURIComponent(`Tuya: Add support for ${device.model || device.product_name || device.name}`);
+  const body = encodeURIComponent(`\`\`\`json\n${JSON.stringify(buildIssuePayload(device, localPollStatus, localPollError), null, 2)}\n\`\`\``);
+  return `${GITHUB_BASE_URL}?title=${title}&body=${body}`;
+};
+
 class TuyaDeviceBox extends Component {
   componentWillMount() {
     this.setState({
@@ -234,8 +285,13 @@ class TuyaDeviceBox extends Component {
         ? params.LOCAL_OVERRIDE
         : device.local_override;
     const ipAddress = params.IP_ADDRESS || device.ip || '';
+    const cloudIp = params.CLOUD_IP || device.cloud_ip || '';
     const hasProtocolSelected = protocolVersion && protocolVersion.length > 0;
-    const canPollLocal = ipAddress && localKey;
+    const isValidIp =
+      typeof ipAddress === 'string' &&
+      /^(25[0-5]|2[0-4]\d|1?\d?\d)(\.(25[0-5]|2[0-4]\d|1?\d?\d)){3}$/.test(ipAddress);
+    const isDifferentFromCloud = !cloudIp || ipAddress !== cloudIp;
+    const canPollLocal = isValidIp && localKey && isDifferentFromCloud;
     const requiresProtocol = localOverride === true;
     const canSave = !requiresProtocol || hasProtocolSelected;
 
@@ -388,6 +444,11 @@ class TuyaDeviceBox extends Component {
                     <option value="3.4">3.4</option>
                     <option value="3.5">3.5</option>
                   </select>
+                  {protocolVersion === '3.5' && (
+                    <div class="text-danger mt-2">
+                      <Text id="integration.tuya.device.protocol35Unsupported" />
+                    </div>
+                  )}
                 </div>
 
                 <div class="form-group">
@@ -471,9 +532,22 @@ class TuyaDeviceBox extends Component {
                   )}
 
                   {!validModel && (
-                    <button class="btn btn-dark" disabled>
-                      <Text id="integration.tuya.unmanagedModelButton" />
-                    </button>
+                    <div>
+                      <div class="alert alert-warning">
+                        <Text id="integration.tuya.unmanagedModelButton" />
+                      </div>
+                      <a
+                        class="btn btn-gray"
+                        href={createGithubUrl(this.state.device, localPollStatus, localPollError)}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                      >
+                        <Text id="integration.philipsHue.device.createGithubIssue" />
+                      </a>
+                      <div class="text-muted mt-2">
+                        <Text id="integration.tuya.device.githubIssueInfo" />
+                      </div>
+                    </div>
                   )}
 
                   {validModel && editButton && (

From 3fd023241e2764d9fd7a205004935344ccf29923 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 20 Feb 2026 13:56:42 +0100
Subject: [PATCH 20/90] feat(tuya): enhance Tuya integration with connection
 status and manual disconnect features

- Added new translations for connection status messages in German, English, and French.
- Implemented API endpoints to get Tuya connection status and to manually disconnect from the Tuya cloud.
- Updated the Tuya service to handle automatic reconnection logic and manual disconnect state.
- Enhanced the SetupTab component to reflect connection status and provide a disconnect button.
- Added tests for the new functionality, including status retrieval and manual disconnect.
---
 front/src/config/i18n/de.json                 |  12 +-
 front/src/config/i18n/en.json                 |  12 +-
 front/src/config/i18n/fr.json                 |  14 +-
 .../integration/all/tuya/TuyaDeviceBox.jsx    |   7 +-
 .../all/tuya/setup-page/SetupTab.jsx          | 219 ++++++++++++++++--
 server/services/tuya/api/tuya.controller.js   |  28 +++
 server/services/tuya/index.js                 |  40 +++-
 server/services/tuya/lib/index.js             |   4 +
 server/services/tuya/lib/tuya.connect.js      |   3 +-
 server/services/tuya/lib/tuya.disconnect.js   |  12 +-
 server/services/tuya/lib/tuya.getStatus.js    |  30 +++
 server/services/tuya/lib/tuya.init.js         |  17 ++
 server/services/tuya/lib/tuya.localScan.js    |  10 +-
 .../tuya/lib/tuya.manualDisconnect.js         |  15 ++
 .../tuya/lib/tuya.saveConfiguration.js        |   1 +
 .../services/tuya/lib/utils/tuya.constants.js |   1 +
 .../services/tuya/lib/tuya.connect.test.js    |  11 +-
 .../services/tuya/lib/tuya.disconnect.test.js |  22 +-
 .../services/tuya/lib/tuya.getStatus.test.js  |  81 +++++++
 .../test/services/tuya/lib/tuya.init.test.js  |  31 ++-
 .../tuya/lib/tuya.manualDisconnect.test.js    |  35 +++
 .../tuya/lib/tuya.saveConfiguration.test.js   |   3 +-
 22 files changed, 563 insertions(+), 45 deletions(-)
 create mode 100644 server/services/tuya/lib/tuya.getStatus.js
 create mode 100644 server/services/tuya/lib/tuya.manualDisconnect.js
 create mode 100644 server/test/services/tuya/lib/tuya.getStatus.test.js
 create mode 100644 server/test/services/tuya/lib/tuya.manualDisconnect.test.js

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index bedb82c2e3..bfc740b67e 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1233,11 +1233,19 @@
         "appAccountIdPlaceholder": "Tuya App User ID eingeben",
         "appUsername": "Smart Life Benutzername (optional)",
         "appUsernamePlaceholder": "Smart Life Konto E-Mail oder Telefon",
-        "saveLabel": "Konfiguration sichern",
+        "saveLabel": "Konfiguration sichern und verbinden",
         "error": "Beim Sichern der Konfiguration ist ein Fehler aufgetreten.",
         "connecting": "Konfiguration gesichert. Die Verbindung mit deinem Tuya-Cloud-Account wird jetzt hergestellt …",
         "connected": "Du hast dich erfolgreich mit dem Tuya-Cloud-Account verbunden!",
-        "connectionError": "Fehler beim Verbinden. Bitte überprüfe deine Konfiguration."
+        "connectionError": "Fehler beim Verbinden. Bitte überprüfe deine Konfiguration.",
+        "notConfigured": "Tuya-Cloud-Verbindungsdaten fehlen oder sind unvollständig.",
+        "connectedAfterSave": "Du hast dich erfolgreich mit dem Tuya-Cloud-Account verbunden!",
+        "connectedStatus": "Mit dem Tuya-Cloud-Account verbunden.",
+        "disconnectSuccess": "Vom Tuya-Cloud-Account erfolgreich getrennt! Der lokale Dienst funktioniert weiterhin (bei einem Neustart von Gladys wird keine automatische Verbindung hergestellt).",
+        "disconnectedUnexpected": "Du wurdest von der Tuya-Cloud getrennt! Bitte überprüfe deine Zugangsdaten und den Status deines <a href=\"https://eu.platform.tuya.com/cloud/products?productType=all\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Core</a>-Testabos.",
+        "disconnectedManual": "Von der Tuya-Cloud getrennt! Der lokale Dienst funktioniert weiterhin (bei einem Neustart von Gladys wird keine automatische Verbindung hergestellt).",
+        "disconnectedMissingConfig": "Von der Tuya-Cloud getrennt.",
+        "disconnectLabel": "Von der Cloud trennen"
       },
       "error": {
         "defaultError": "Beim Sichern des Geräts ist ein Fehler aufgetreten.",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index 2c19985dad..8be7a74c77 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1128,11 +1128,19 @@
         "appAccountIdPlaceholder": "Enter Tuya app User ID",
         "appUsername": "Smart Life username (optional)",
         "appUsernamePlaceholder": "Smart Life account email or phone",
-        "saveLabel": "Save configuration",
+        "saveLabel": "Save configuration and connect",
         "error": "An error occurred while saving configuration.",
         "connecting": "Configuration saved. Now connecting to your Tuya cloud account...",
+        "connectionError": "Error while connecting, please check your configuration.",
+        "notConfigured": "Tuya cloud connection details are missing or incomplete.",
         "connected": "Connected to the Tuya cloud account with success !",
-        "connectionError": "Error while connecting, please check your configuration."
+        "connectedAfterSave": "Connected to the Tuya cloud account with success !",
+        "connectedStatus": "Connected to the Tuya cloud account.",
+        "disconnectSuccess": "Disconnected from the Tuya cloud account with success ! Local service still works (it will not auto-reconnect when Gladys restarts).",
+        "disconnectedUnexpected": "You have been disconnected from the Tuya cloud! Please check your credentials and your <a href=\"https://eu.platform.tuya.com/cloud/products?productType=all\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Core</a> trial status.",
+        "disconnectedManual": "Disconnected from the Tuya cloud! Local service still works (it will not auto-reconnect when Gladys restarts).",
+        "disconnectedMissingConfig": "Disconnected from the Tuya cloud.",
+        "disconnectLabel": "Disconnect from cloud"
       },
       "error": {
         "defaultError": "There was an error saving the device.",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index c92432de14..cd25076810 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1363,11 +1363,19 @@
         "appAccountIdPlaceholder": "Entrez l'UID de l'app de Tuya",
         "appUsername": "Identifiant Smart Life (optionnel)",
         "appUsernamePlaceholder": "Email ou téléphone du compte Smart Life",
-        "saveLabel": "Enregistrer la configuration",
+        "saveLabel": "Enregistrer la configuration et se connecter",
         "error": "Une erreur s'est produite lors de la sauvegarde de la configuration.",
         "connecting": "Configuration sauvegardée. Connexion à votre compte cloud Tuya...",
-        "connected": "Connexion réussie au compte cloud Tuya !",
-        "connectionError": "Erreur lors de la connexion, veuillez vérifier votre configuration."
+        "connectionError": "Erreur lors de la connexion, veuillez vérifier votre configuration.",
+        "notConfigured": "Information de connexion au compte cloud Tuya non renseignées ou manquante !",
+        "connected": "Connexion au compte cloud Tuya réussie !",
+        "connectedAfterSave": "Connexion au compte cloud Tuya réussie !",
+        "connectedStatus": "Connecté au compte cloud Tuya.",
+        "disconnectSuccess": "Déconnexion du compte cloud Tuya réussie ! Le service local fonctionne toujours (vous ne serez pas reconnecté automatiquement au redémarrage de Gladys).",
+        "disconnectedUnexpected": "Vous avez été déconnecté du cloud Tuya ! Vérifier vos informations de connexion et l'état de votre abonnement d'essai <a href=\"https://eu.platform.tuya.com/cloud/products?productType=all\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Core</a>.",
+        "disconnectedManual": "Déconnecté du cloud Tuya ! Le service local fonctionne toujours (vous ne serez pas reconnecté automatiquement au redémarrage de Gladys).",
+        "disconnectedMissingConfig": "Déconnecté du cloud Tuya.",
+        "disconnectLabel": "Se déconnecter du cloud"
       },
       "error": {
         "defaultError": "Une erreur s'est produite lors de l'enregistrement de l'appareil.",
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 22350d1a72..5ae682eaca 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -54,7 +54,9 @@ const buildIssuePayload = (device, localPollStatus, localPollError) => {
 
 const createGithubUrl = (device, localPollStatus, localPollError) => {
   const title = encodeURIComponent(`Tuya: Add support for ${device.model || device.product_name || device.name}`);
-  const body = encodeURIComponent(`\`\`\`json\n${JSON.stringify(buildIssuePayload(device, localPollStatus, localPollError), null, 2)}\n\`\`\``);
+  const body = encodeURIComponent(
+    `\`\`\`json\n${JSON.stringify(buildIssuePayload(device, localPollStatus, localPollError), null, 2)}\n\`\`\``
+  );
   return `${GITHUB_BASE_URL}?title=${title}&body=${body}`;
 };
 
@@ -288,8 +290,7 @@ class TuyaDeviceBox extends Component {
     const cloudIp = params.CLOUD_IP || device.cloud_ip || '';
     const hasProtocolSelected = protocolVersion && protocolVersion.length > 0;
     const isValidIp =
-      typeof ipAddress === 'string' &&
-      /^(25[0-5]|2[0-4]\d|1?\d?\d)(\.(25[0-5]|2[0-4]\d|1?\d?\d)){3}$/.test(ipAddress);
+      typeof ipAddress === 'string' && /^(25[0-5]|2[0-4]\d|1?\d?\d)(\.(25[0-5]|2[0-4]\d|1?\d?\d)){3}$/.test(ipAddress);
     const isDifferentFromCloud = !cloudIp || ipAddress !== cloudIp;
     const canPollLocal = isValidIp && localKey && isDifferentFromCloud;
     const requiresProtocol = localOverride === true;
diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 6a5cd69468..26faa2e512 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -14,12 +14,21 @@ class SetupTab extends Component {
       tuyaConnectionError: null,
       tuyaConnected: false,
       tuyaConnecting: false,
+      tuyaConfigured: false,
+      tuyaDisconnected: false,
+      tuyaManuallyDisconnected: false,
+      tuyaManualDisconnectJustDone: false,
+      tuyaJustSaved: false,
+      tuyaJustSavedMissing: false,
+      tuyaDisconnecting: false,
+      tuyaStatusLoading: false,
       showClientSecret: false
     };
   }
 
   componentWillMount() {
     this.getTuyaConfiguration();
+    this.getTuyaStatus();
     this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS, this.updateConnectionStatus);
     this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.TUYA.ERROR, this.displayConnectionError);
   }
@@ -44,23 +53,21 @@ class SetupTab extends Component {
       tuyaAppAccountId,
       tuyaAppUsername
     });
-    try {
-      const { value: endpoint } = await this.props.httpClient.get('/api/v1/service/tuya/variable/TUYA_ENDPOINT');
-      tuyaEndpoint = endpoint;
-
-      const { value: accessKey } = await this.props.httpClient.get('/api/v1/service/tuya/variable/TUYA_ACCESS_KEY');
-      tuyaAccessKey = accessKey;
-
-      const { value: secretKey } = await this.props.httpClient.get('/api/v1/service/tuya/variable/TUYA_SECRET_KEY');
-      tuyaSecretKey = secretKey;
-
-      const { value: appAccountId } = await this.props.httpClient.get(
-        '/api/v1/service/tuya/variable/TUYA_APP_ACCOUNT_UID'
-      );
-      tuyaAppAccountId = appAccountId;
+    const getVariable = async (name, fallback = '') => {
+      try {
+        const response = await this.props.httpClient.get(`/api/v1/service/tuya/variable/${name}`);
+        return response && response.value ? response.value : fallback;
+      } catch (e) {
+        return fallback;
+      }
+    };
 
-      const { value: appUsername } = await this.props.httpClient.get('/api/v1/service/tuya/variable/TUYA_APP_USERNAME');
-      tuyaAppUsername = appUsername;
+    try {
+      tuyaEndpoint = await getVariable('TUYA_ENDPOINT');
+      tuyaAccessKey = await getVariable('TUYA_ACCESS_KEY');
+      tuyaSecretKey = await getVariable('TUYA_SECRET_KEY');
+      tuyaAppAccountId = await getVariable('TUYA_APP_ACCOUNT_UID');
+      tuyaAppUsername = await getVariable('TUYA_APP_USERNAME');
 
       this.setState({
         tuyaGetSettingsStatus: RequestStatus.Success,
@@ -68,11 +75,53 @@ class SetupTab extends Component {
         tuyaAccessKey,
         tuyaSecretKey,
         tuyaAppAccountId,
-        tuyaAppUsername
+        tuyaAppUsername,
+        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey)
       });
     } catch (e) {
       this.setState({
-        tuyaGetSettingsStatus: RequestStatus.Error
+        tuyaGetSettingsStatus: RequestStatus.Error,
+        tuyaEndpoint,
+        tuyaAccessKey,
+        tuyaSecretKey,
+        tuyaAppAccountId,
+        tuyaAppUsername,
+        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey)
+      });
+    }
+  }
+
+  async getTuyaStatus() {
+    this.setState({
+      tuyaStatusLoading: true
+    });
+    try {
+      const response = await this.props.httpClient.get('/api/v1/service/tuya/status');
+      const status = response && response.status;
+      const configured = response && response.configured;
+      const manualDisconnect = response && response.manual_disconnect;
+      const isConnected = status === 'connected';
+      const isConnecting = status === 'connecting';
+      const isError = status === 'error';
+      const isManualDisconnect = !!manualDisconnect;
+      const isUnexpectedDisconnect = isError && configured && !manualDisconnect;
+
+      this.setState({
+        tuyaStatusLoading: false,
+        tuyaConfigured: !!configured,
+        tuyaConnected: isManualDisconnect ? false : isConnected,
+        tuyaConnecting: isManualDisconnect ? false : isConnecting,
+        tuyaDisconnected: isUnexpectedDisconnect,
+        tuyaManuallyDisconnected: isManualDisconnect,
+        tuyaManualDisconnectJustDone: false,
+        tuyaJustSaved: false,
+        tuyaJustSavedMissing: false,
+        tuyaConnectionStatus: isManualDisconnect ? null : isError ? RequestStatus.Error : null,
+        tuyaConnectionError: isManualDisconnect ? null : isError ? response.error : null
+      });
+    } catch (e) {
+      this.setState({
+        tuyaStatusLoading: false
       });
     }
   }
@@ -84,7 +133,12 @@ class SetupTab extends Component {
       tuyaConnectionStatus: null,
       tuyaConnectionError: null,
       tuyaConnected: false,
-      tuyaConnecting: false
+      tuyaConnecting: false,
+      tuyaDisconnected: false,
+      tuyaManuallyDisconnected: false,
+      tuyaManualDisconnectJustDone: false,
+      tuyaJustSaved: true,
+      tuyaJustSavedMissing: false
     });
     try {
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_ENDPOINT', {
@@ -107,13 +161,30 @@ class SetupTab extends Component {
         value: this.state.tuyaAppUsername.trim()
       });
 
+      await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_MANUAL_DISCONNECT', {
+        value: false
+      });
+
+      const configured = !!(this.state.tuyaEndpoint && this.state.tuyaAccessKey && this.state.tuyaSecretKey);
+      if (!configured) {
+        this.setState({
+          tuyaSaveSettingsStatus: RequestStatus.Success,
+          tuyaConfigured: false,
+          tuyaDisconnected: true,
+          tuyaJustSavedMissing: true,
+          tuyaJustSaved: false
+        });
+        return;
+      }
+
       // start service
       const service = await this.props.httpClient.post('/api/v1/service/tuya/start');
       if (service && service.status === 'ERROR') {
         throw new Error('TUYA_START_ERROR');
       }
       this.setState({
-        tuyaSaveSettingsStatus: RequestStatus.Success
+        tuyaSaveSettingsStatus: RequestStatus.Success,
+        tuyaConfigured: true
       });
     } catch (e) {
       const responseMessage =
@@ -129,11 +200,16 @@ class SetupTab extends Component {
   updateConnectionStatus = event => {
     const status = event && event.status;
     const error = event && event.error;
+    const manualDisconnect = event && event.manual_disconnect;
     if (status === 'connecting') {
       this.setState({
         tuyaConnectionStatus: RequestStatus.Success,
         tuyaConnecting: true,
-        tuyaConnected: false
+        tuyaConnected: false,
+        tuyaDisconnected: false,
+        tuyaManuallyDisconnected: false,
+        tuyaManualDisconnectJustDone: false,
+        tuyaJustSavedMissing: false
       });
       return;
     }
@@ -142,7 +218,11 @@ class SetupTab extends Component {
         tuyaConnectionStatus: RequestStatus.Success,
         tuyaConnectionError: null,
         tuyaConnecting: false,
-        tuyaConnected: true
+        tuyaConnected: true,
+        tuyaDisconnected: false,
+        tuyaManuallyDisconnected: false,
+        tuyaManualDisconnectJustDone: false,
+        tuyaJustSavedMissing: false
       });
       return;
     }
@@ -151,8 +231,24 @@ class SetupTab extends Component {
         tuyaConnectionStatus: RequestStatus.Error,
         tuyaConnecting: false,
         tuyaConnected: false,
+        tuyaDisconnected: this.state.tuyaConfigured && !manualDisconnect,
+        tuyaManuallyDisconnected: false,
+        tuyaManualDisconnectJustDone: false,
+        tuyaJustSavedMissing: false,
         tuyaConnectionError: error || this.state.tuyaConnectionError
       });
+      return;
+    }
+    if (status === 'not_initialized') {
+      this.setState({
+        tuyaConnectionStatus: null,
+        tuyaConnecting: false,
+        tuyaConnected: false,
+        tuyaDisconnected: !manualDisconnect,
+        tuyaManuallyDisconnected: !!manualDisconnect,
+        tuyaManualDisconnectJustDone: manualDisconnect ? this.state.tuyaManualDisconnectJustDone : false,
+        tuyaJustSavedMissing: false
+      });
     }
   };
 
@@ -167,8 +263,14 @@ class SetupTab extends Component {
   };
 
   updateConfiguration = e => {
-    this.setState({
-      [e.target.name]: e.target.value
+    const { name, value } = e.target;
+    this.setState(prevState => {
+      const nextState = { ...prevState, [name]: value };
+      const configured = !!(nextState.tuyaEndpoint && nextState.tuyaAccessKey && nextState.tuyaSecretKey);
+      return {
+        [name]: value,
+        tuyaConfigured: configured
+      };
     });
   };
 
@@ -178,6 +280,31 @@ class SetupTab extends Component {
     });
   };
 
+  disconnectFromCloud = async () => {
+    this.setState({
+      tuyaDisconnecting: true,
+      tuyaConnectionError: null
+    });
+    try {
+      await this.props.httpClient.post('/api/v1/service/tuya/disconnect');
+      this.setState({
+        tuyaDisconnecting: false,
+        tuyaConnected: false,
+        tuyaConnecting: false,
+        tuyaDisconnected: false,
+        tuyaManuallyDisconnected: true,
+        tuyaManualDisconnectJustDone: true,
+        tuyaConnectionStatus: null
+      });
+    } catch (e) {
+      this.setState({
+        tuyaDisconnecting: false,
+        tuyaConnectionStatus: RequestStatus.Error,
+        tuyaConnectionError: (e && e.message) || 'unknown'
+      });
+    }
+  };
+
   render(props, state) {
     return (
       <div class="card">
@@ -204,6 +331,16 @@ class SetupTab extends Component {
                   )}
                 </div>
               )}
+              {!state.tuyaConfigured && !state.tuyaStatusLoading && (
+                <p class="alert alert-warning">
+                  <Text id="integration.tuya.setup.notConfigured" />
+                </p>
+              )}
+              {state.tuyaJustSavedMissing && (
+                <p class="alert alert-danger">
+                  <Text id="integration.tuya.setup.disconnectedMissingConfig" />
+                </p>
+              )}
               {state.tuyaConnecting && (
                 <p class="alert alert-info">
                   <Text id="integration.tuya.setup.connecting" />
@@ -211,7 +348,29 @@ class SetupTab extends Component {
               )}
               {state.tuyaConnected && (
                 <p class="alert alert-success">
-                  <Text id="integration.tuya.setup.connected" />
+                  <Text
+                    id={
+                      state.tuyaJustSaved
+                        ? 'integration.tuya.setup.connectedAfterSave'
+                        : 'integration.tuya.setup.connectedStatus'
+                    }
+                  />
+                </p>
+              )}
+              {state.tuyaManuallyDisconnected && (
+                <p class="alert alert-info">
+                  <Text
+                    id={
+                      state.tuyaManualDisconnectJustDone
+                        ? 'integration.tuya.setup.disconnectSuccess'
+                        : 'integration.tuya.setup.disconnectedManual'
+                    }
+                  />
+                </p>
+              )}
+              {state.tuyaDisconnected && state.tuyaConfigured && (
+                <p class="alert alert-danger">
+                  <MarkupText id="integration.tuya.setup.disconnectedUnexpected" />
                 </p>
               )}
               {state.tuyaConnectionStatus === RequestStatus.Error && (
@@ -352,6 +511,16 @@ class SetupTab extends Component {
                       <Text id="integration.tuya.setup.saveLabel" />
                     </button>
                   </div>
+                  <div class="col-auto">
+                    <button
+                      type="button"
+                      class="btn btn-outline-danger"
+                      onClick={this.disconnectFromCloud}
+                      disabled={!state.tuyaConfigured || state.tuyaDisconnecting || state.tuyaConnecting}
+                    >
+                      <Text id="integration.tuya.setup.disconnectLabel" />
+                    </button>
+                  </div>
                 </div>
               </form>
             </div>
diff --git a/server/services/tuya/api/tuya.controller.js b/server/services/tuya/api/tuya.controller.js
index ca4e4995fa..0270b2e9b0 100644
--- a/server/services/tuya/api/tuya.controller.js
+++ b/server/services/tuya/api/tuya.controller.js
@@ -132,6 +132,26 @@ module.exports = function TuyaController(tuyaManager) {
     });
   }
 
+  /**
+   * @api {get} /api/v1/service/tuya/status Get Tuya connection status.
+   * @apiName status
+   * @apiGroup Tuya
+   */
+  async function status(req, res) {
+    const response = await tuyaManager.getStatus();
+    res.json(response);
+  }
+
+  /**
+   * @api {post} /api/v1/service/tuya/disconnect Disconnect Tuya cloud.
+   * @apiName disconnect
+   * @apiGroup Tuya
+   */
+  async function disconnect(req, res) {
+    await tuyaManager.manualDisconnect();
+    res.json({ success: true });
+  }
+
   return {
     'get /api/v1/service/tuya/discover': {
       authenticated: true,
@@ -145,5 +165,13 @@ module.exports = function TuyaController(tuyaManager) {
       authenticated: true,
       controller: asyncMiddleware(localScan),
     },
+    'get /api/v1/service/tuya/status': {
+      authenticated: true,
+      controller: asyncMiddleware(status),
+    },
+    'post /api/v1/service/tuya/disconnect': {
+      authenticated: true,
+      controller: asyncMiddleware(disconnect),
+    },
   };
 };
diff --git a/server/services/tuya/index.js b/server/services/tuya/index.js
index 712f159d3b..8d8a29d375 100644
--- a/server/services/tuya/index.js
+++ b/server/services/tuya/index.js
@@ -6,6 +6,35 @@ const { STATUS } = require('./lib/utils/tuya.constants');
 
 module.exports = function TuyaService(gladys, serviceId) {
   const tuyaHandler = new TuyaHandler(gladys, serviceId);
+  const RECONNECT_INTERVAL_MS = 1000 * 60 * 30;
+  let reconnectInterval = null;
+
+  /**
+   * @description Attempt to reconnect to Tuya if configured and not manually disconnected.
+   * @returns {Promise<void>} Promise of nothing.
+   * @example
+   * await tryReconnect();
+   */
+  async function tryReconnect() {
+    try {
+      const status = await tuyaHandler.getStatus();
+      if (!status.configured || status.manual_disconnect) {
+        return;
+      }
+      if (
+        tuyaHandler.status === STATUS.CONNECTED ||
+        tuyaHandler.status === STATUS.CONNECTING ||
+        tuyaHandler.status === STATUS.DISCOVERING_DEVICES
+      ) {
+        return;
+      }
+      logger.info('Tuya is disconnected, attempting auto-reconnect...');
+      const configuration = await tuyaHandler.getConfiguration();
+      await tuyaHandler.connect(configuration);
+    } catch (e) {
+      logger.warn('Auto-reconnect to Tuya failed:', e.message || e);
+    }
+  }
 
   /**
    * @public
@@ -16,7 +45,12 @@ module.exports = function TuyaService(gladys, serviceId) {
   async function start() {
     logger.info('Starting Tuya service', serviceId);
     await tuyaHandler.init();
-    await tuyaHandler.loadDevices();
+    if (tuyaHandler.status === STATUS.CONNECTED) {
+      await tuyaHandler.loadDevices();
+    }
+    if (!reconnectInterval) {
+      reconnectInterval = setInterval(tryReconnect, RECONNECT_INTERVAL_MS);
+    }
   }
 
   /**
@@ -27,6 +61,10 @@ module.exports = function TuyaService(gladys, serviceId) {
    */
   async function stop() {
     logger.info('Stopping Tuya service');
+    if (reconnectInterval) {
+      clearInterval(reconnectInterval);
+      reconnectInterval = null;
+    }
     await tuyaHandler.disconnect();
   }
 
diff --git a/server/services/tuya/lib/index.js b/server/services/tuya/lib/index.js
index d1dd7a9942..05615b6ccb 100644
--- a/server/services/tuya/lib/index.js
+++ b/server/services/tuya/lib/index.js
@@ -13,6 +13,8 @@ const { setValue } = require('./tuya.setValue');
 const { poll } = require('./tuya.poll');
 const { localScan } = require('./tuya.localScan');
 const { localPoll } = require('./tuya.localPoll');
+const { getStatus } = require('./tuya.getStatus');
+const { manualDisconnect } = require('./tuya.manualDisconnect');
 
 const { STATUS } = require('./utils/tuya.constants');
 
@@ -40,5 +42,7 @@ TuyaHandler.prototype.setValue = setValue;
 TuyaHandler.prototype.poll = poll;
 TuyaHandler.prototype.localScan = localScan;
 TuyaHandler.prototype.localPoll = localPoll;
+TuyaHandler.prototype.getStatus = getStatus;
+TuyaHandler.prototype.manualDisconnect = manualDisconnect;
 
 module.exports = TuyaHandler;
diff --git a/server/services/tuya/lib/tuya.connect.js b/server/services/tuya/lib/tuya.connect.js
index e63527ffe6..47986a6ab1 100644
--- a/server/services/tuya/lib/tuya.connect.js
+++ b/server/services/tuya/lib/tuya.connect.js
@@ -4,7 +4,7 @@ const logger = require('../../../utils/logger');
 const { ServiceNotConfiguredError } = require('../../../utils/coreErrors');
 const { WEBSOCKET_MESSAGE_TYPES, EVENTS } = require('../../../utils/constants');
 
-const { STATUS } = require('./utils/tuya.constants');
+const { STATUS, GLADYS_VARIABLES } = require('./utils/tuya.constants');
 
 /**
  * @description Connect to Tuya cloud.
@@ -37,6 +37,7 @@ async function connect(configuration) {
 
   try {
     await this.connector.client.init();
+    await this.gladys.variable.setValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, false, this.serviceId);
     this.status = STATUS.CONNECTED;
     logger.debug('Connected to Tuya');
   } catch (e) {
diff --git a/server/services/tuya/lib/tuya.disconnect.js b/server/services/tuya/lib/tuya.disconnect.js
index 1406c585be..e54706128d 100644
--- a/server/services/tuya/lib/tuya.disconnect.js
+++ b/server/services/tuya/lib/tuya.disconnect.js
@@ -1,15 +1,25 @@
 const logger = require('../../../utils/logger');
+const { WEBSOCKET_MESSAGE_TYPES, EVENTS } = require('../../../utils/constants');
 const { STATUS } = require('./utils/tuya.constants');
 
 /**
  * @description Disconnects service and dependencies.
+ * @param {object} [options] - Disconnect options.
+ * @param {boolean} [options.manual] - Whether this is a manual disconnect.
  * @example
  * disconnect();
  */
-function disconnect() {
+function disconnect(options = {}) {
   logger.debug('Disonnecting from Tuya...');
+  const { manual = false } = options;
   this.connector = null;
   this.status = STATUS.NOT_INITIALIZED;
+  this.lastError = null;
+
+  this.gladys.event.emit(EVENTS.WEBSOCKET.SEND_ALL, {
+    type: WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS,
+    payload: { status: this.status, manual_disconnect: manual },
+  });
 }
 
 module.exports = {
diff --git a/server/services/tuya/lib/tuya.getStatus.js b/server/services/tuya/lib/tuya.getStatus.js
new file mode 100644
index 0000000000..1cfcceaae2
--- /dev/null
+++ b/server/services/tuya/lib/tuya.getStatus.js
@@ -0,0 +1,30 @@
+const { GLADYS_VARIABLES, STATUS } = require('./utils/tuya.constants');
+
+/**
+ * @description Get Tuya connection and configuration status.
+ * @returns {Promise<object>} Status object.
+ * @example
+ * const status = await getStatus();
+ */
+async function getStatus() {
+  const endpoint = await this.gladys.variable.getValue(GLADYS_VARIABLES.ENDPOINT, this.serviceId);
+  const accessKey = await this.gladys.variable.getValue(GLADYS_VARIABLES.ACCESS_KEY, this.serviceId);
+  const secretKey = await this.gladys.variable.getValue(GLADYS_VARIABLES.SECRET_KEY, this.serviceId);
+  const manualDisconnect = await this.gladys.variable.getValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, this.serviceId);
+
+  const configured = Boolean(endpoint && accessKey && secretKey);
+  const manualDisconnectEnabled =
+    manualDisconnect === true || manualDisconnect === 'true' || manualDisconnect === '1' || manualDisconnect === 1;
+
+  return {
+    status: this.status || STATUS.NOT_INITIALIZED,
+    connected: this.status === STATUS.CONNECTED,
+    configured,
+    error: this.lastError,
+    manual_disconnect: manualDisconnectEnabled,
+  };
+}
+
+module.exports = {
+  getStatus,
+};
diff --git a/server/services/tuya/lib/tuya.init.js b/server/services/tuya/lib/tuya.init.js
index a4cee62c93..4ec4ab64e7 100644
--- a/server/services/tuya/lib/tuya.init.js
+++ b/server/services/tuya/lib/tuya.init.js
@@ -1,3 +1,6 @@
+const { GLADYS_VARIABLES, STATUS } = require('./utils/tuya.constants');
+const { EVENTS, WEBSOCKET_MESSAGE_TYPES } = require('../../../utils/constants');
+
 /**
  * @description Initialize service with properties and connect to devices.
  * @example
@@ -5,6 +8,20 @@
  */
 async function init() {
   const configuration = await this.getConfiguration();
+  const manualDisconnect = await this.gladys.variable.getValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, this.serviceId);
+  const manualDisconnectEnabled =
+    manualDisconnect === true || manualDisconnect === 'true' || manualDisconnect === '1' || manualDisconnect === 1;
+
+  if (manualDisconnectEnabled) {
+    this.status = STATUS.NOT_INITIALIZED;
+    this.lastError = null;
+    this.gladys.event.emit(EVENTS.WEBSOCKET.SEND_ALL, {
+      type: WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS,
+      payload: { status: this.status, manual_disconnect: true },
+    });
+    return;
+  }
+
   await this.connect(configuration);
 }
 
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index abc0723114..df55322d17 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -9,7 +9,10 @@ const formatHex = (buffer, maxLen = 128) => {
     return '';
   }
   const slice = buffer.slice(0, maxLen);
-  return slice.toString('hex').match(/.{1,2}/g).join(' ');
+  return slice
+    .toString('hex')
+    .match(/.{1,2}/g)
+    .join(' ');
 };
 
 const formatAscii = (buffer, maxLen = 256) => {
@@ -17,7 +20,10 @@ const formatAscii = (buffer, maxLen = 256) => {
     return '';
   }
   const slice = buffer.slice(0, maxLen);
-  return slice.toString('utf8').replace(/\s+/g, ' ').trim();
+  return slice
+    .toString('utf8')
+    .replace(/\s+/g, ' ')
+    .trim();
 };
 
 /**
diff --git a/server/services/tuya/lib/tuya.manualDisconnect.js b/server/services/tuya/lib/tuya.manualDisconnect.js
new file mode 100644
index 0000000000..71d2151bc3
--- /dev/null
+++ b/server/services/tuya/lib/tuya.manualDisconnect.js
@@ -0,0 +1,15 @@
+const { GLADYS_VARIABLES } = require('./utils/tuya.constants');
+
+/**
+ * @description Manually disconnect from Tuya cloud and disable auto-reconnect.
+ * @example
+ * await manualDisconnect();
+ */
+async function manualDisconnect() {
+  await this.gladys.variable.setValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, true, this.serviceId);
+  await this.disconnect({ manual: true });
+}
+
+module.exports = {
+  manualDisconnect,
+};
diff --git a/server/services/tuya/lib/tuya.saveConfiguration.js b/server/services/tuya/lib/tuya.saveConfiguration.js
index 561c8610ff..1a013b1cf7 100644
--- a/server/services/tuya/lib/tuya.saveConfiguration.js
+++ b/server/services/tuya/lib/tuya.saveConfiguration.js
@@ -17,6 +17,7 @@ async function saveConfiguration(configuration) {
   await this.gladys.variable.setValue(GLADYS_VARIABLES.SECRET_KEY, secretKey, this.serviceId);
   await this.gladys.variable.setValue(GLADYS_VARIABLES.APP_ACCOUNT_UID, appAccountId, this.serviceId);
   await this.gladys.variable.setValue(GLADYS_VARIABLES.APP_USERNAME, appUsername, this.serviceId);
+  await this.gladys.variable.setValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, false, this.serviceId);
 
   return configuration;
 }
diff --git a/server/services/tuya/lib/utils/tuya.constants.js b/server/services/tuya/lib/utils/tuya.constants.js
index 8f032497a4..2a541646a1 100644
--- a/server/services/tuya/lib/utils/tuya.constants.js
+++ b/server/services/tuya/lib/utils/tuya.constants.js
@@ -6,6 +6,7 @@ const GLADYS_VARIABLES = {
   REFRESH_TOKEN: 'TUYA_REFRESH_TOKEN',
   APP_ACCOUNT_UID: 'TUYA_APP_ACCOUNT_UID',
   APP_USERNAME: 'TUYA_APP_USERNAME',
+  MANUAL_DISCONNECT: 'TUYA_MANUAL_DISCONNECT',
 };
 
 const TUYA_ENDPOINTS = {
diff --git a/server/test/services/tuya/lib/tuya.connect.test.js b/server/test/services/tuya/lib/tuya.connect.test.js
index 7335394174..2dddd5a924 100644
--- a/server/test/services/tuya/lib/tuya.connect.test.js
+++ b/server/test/services/tuya/lib/tuya.connect.test.js
@@ -11,7 +11,7 @@ const connect = proxyquire('../../../../services/tuya/lib/tuya.connect', {
 const TuyaHandler = proxyquire('../../../../services/tuya/lib/index', {
   './tuya.connect.js': connect,
 });
-const { STATUS } = require('../../../../services/tuya/lib/utils/tuya.constants');
+const { STATUS, GLADYS_VARIABLES } = require('../../../../services/tuya/lib/utils/tuya.constants');
 const { EVENTS, WEBSOCKET_MESSAGE_TYPES } = require('../../../../utils/constants');
 const { ServiceNotConfiguredError } = require('../../../../utils/coreErrors');
 
@@ -19,6 +19,9 @@ const gladys = {
   event: {
     emit: fake.returns(null),
   },
+  variable: {
+    setValue: fake.resolves(null),
+  },
 };
 const serviceId = 'ffa13430-df93-488a-9733-5c540e9558e0';
 
@@ -49,6 +52,7 @@ describe('TuyaHandler.connect', () => {
 
     assert.notCalled(gladys.event.emit);
     assert.notCalled(client.init);
+    assert.notCalled(gladys.variable.setValue);
   });
 
   it('no access key stored, should fail', async () => {
@@ -66,6 +70,7 @@ describe('TuyaHandler.connect', () => {
 
     assert.notCalled(gladys.event.emit);
     assert.notCalled(client.init);
+    assert.notCalled(gladys.variable.setValue);
   });
 
   it('no secret key stored, should fail', async () => {
@@ -83,6 +88,7 @@ describe('TuyaHandler.connect', () => {
 
     assert.notCalled(gladys.event.emit);
     assert.notCalled(client.init);
+    assert.notCalled(gladys.variable.setValue);
   });
 
   it('well connected', async () => {
@@ -95,6 +101,8 @@ describe('TuyaHandler.connect', () => {
     expect(tuyaHandler.status).to.eq(STATUS.CONNECTED);
 
     assert.calledOnce(client.init);
+    assert.calledOnce(gladys.variable.setValue);
+    assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, false, serviceId);
 
     assert.callCount(gladys.event.emit, 2);
     assert.calledWith(gladys.event.emit, EVENTS.WEBSOCKET.SEND_ALL, {
@@ -119,6 +127,7 @@ describe('TuyaHandler.connect', () => {
     expect(tuyaHandler.status).to.eq(STATUS.ERROR);
 
     assert.calledOnce(client.init);
+    assert.notCalled(gladys.variable.setValue);
 
     assert.callCount(gladys.event.emit, 3);
     assert.calledWith(gladys.event.emit, EVENTS.WEBSOCKET.SEND_ALL, {
diff --git a/server/test/services/tuya/lib/tuya.disconnect.test.js b/server/test/services/tuya/lib/tuya.disconnect.test.js
index b6731986ff..e76dd5d006 100644
--- a/server/test/services/tuya/lib/tuya.disconnect.test.js
+++ b/server/test/services/tuya/lib/tuya.disconnect.test.js
@@ -1,9 +1,15 @@
 const { expect } = require('chai');
+const sinon = require('sinon');
 
 const TuyaHandler = require('../../../../services/tuya/lib/index');
 const { STATUS } = require('../../../../services/tuya/lib/utils/tuya.constants');
+const { EVENTS, WEBSOCKET_MESSAGE_TYPES } = require('../../../../utils/constants');
 
-const gladys = {};
+const gladys = {
+  event: {
+    emit: sinon.fake.returns(null),
+  },
+};
 const serviceId = 'ffa13430-df93-488a-9733-5c540e9558e0';
 
 describe('TuyaHandler.disconnect', () => {
@@ -18,5 +24,19 @@ describe('TuyaHandler.disconnect', () => {
 
     expect(tuyaHandler.status).to.eq(STATUS.NOT_INITIALIZED);
     expect(tuyaHandler.connector).to.eq(null);
+    expect(tuyaHandler.lastError).to.eq(null);
+    sinon.assert.calledWith(gladys.event.emit, EVENTS.WEBSOCKET.SEND_ALL, {
+      type: WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS,
+      payload: { status: STATUS.NOT_INITIALIZED, manual_disconnect: false },
+    });
+  });
+
+  it('should send manual disconnect status', () => {
+    tuyaHandler.disconnect({ manual: true });
+
+    sinon.assert.calledWith(gladys.event.emit, EVENTS.WEBSOCKET.SEND_ALL, {
+      type: WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS,
+      payload: { status: STATUS.NOT_INITIALIZED, manual_disconnect: true },
+    });
   });
 });
diff --git a/server/test/services/tuya/lib/tuya.getStatus.test.js b/server/test/services/tuya/lib/tuya.getStatus.test.js
new file mode 100644
index 0000000000..43859684e7
--- /dev/null
+++ b/server/test/services/tuya/lib/tuya.getStatus.test.js
@@ -0,0 +1,81 @@
+const { expect } = require('chai');
+const sinon = require('sinon');
+
+const { assert } = sinon;
+
+const TuyaHandler = require('../../../../services/tuya/lib/index');
+const { GLADYS_VARIABLES, STATUS } = require('../../../../services/tuya/lib/utils/tuya.constants');
+
+const gladys = {
+  variable: {
+    getValue: sinon.stub(),
+  },
+};
+const serviceId = 'ffa13430-df93-488a-9733-5c540e9558e0';
+
+describe('TuyaHandler.getStatus', () => {
+  const tuyaHandler = new TuyaHandler(gladys, serviceId);
+
+  beforeEach(() => {
+    sinon.reset();
+  });
+
+  afterEach(() => {
+    sinon.reset();
+  });
+
+  it('should return configured=false when credentials are missing', async () => {
+    gladys.variable.getValue
+      .withArgs(GLADYS_VARIABLES.ENDPOINT, serviceId)
+      .returns(null)
+      .withArgs(GLADYS_VARIABLES.ACCESS_KEY, serviceId)
+      .returns('accessKey')
+      .withArgs(GLADYS_VARIABLES.SECRET_KEY, serviceId)
+      .returns('secretKey')
+      .withArgs(GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId)
+      .returns(null);
+
+    tuyaHandler.status = STATUS.NOT_INITIALIZED;
+    tuyaHandler.lastError = null;
+
+    const status = await tuyaHandler.getStatus();
+
+    expect(status).to.deep.eq({
+      status: STATUS.NOT_INITIALIZED,
+      connected: false,
+      configured: false,
+      error: null,
+      manual_disconnect: false,
+    });
+
+    assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ENDPOINT, serviceId);
+    assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ACCESS_KEY, serviceId);
+    assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.SECRET_KEY, serviceId);
+    assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId);
+  });
+
+  it('should return manual_disconnect=true when stored as string', async () => {
+    gladys.variable.getValue
+      .withArgs(GLADYS_VARIABLES.ENDPOINT, serviceId)
+      .returns('endpoint')
+      .withArgs(GLADYS_VARIABLES.ACCESS_KEY, serviceId)
+      .returns('accessKey')
+      .withArgs(GLADYS_VARIABLES.SECRET_KEY, serviceId)
+      .returns('secretKey')
+      .withArgs(GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId)
+      .returns('1');
+
+    tuyaHandler.status = STATUS.CONNECTED;
+    tuyaHandler.lastError = 'nope';
+
+    const status = await tuyaHandler.getStatus();
+
+    expect(status).to.deep.eq({
+      status: STATUS.CONNECTED,
+      connected: true,
+      configured: true,
+      error: 'nope',
+      manual_disconnect: true,
+    });
+  });
+});
diff --git a/server/test/services/tuya/lib/tuya.init.test.js b/server/test/services/tuya/lib/tuya.init.test.js
index 4ac06cf7d8..87d5ab57fc 100644
--- a/server/test/services/tuya/lib/tuya.init.test.js
+++ b/server/test/services/tuya/lib/tuya.init.test.js
@@ -45,17 +45,20 @@ describe('TuyaHandler.init', () => {
       .withArgs(GLADYS_VARIABLES.SECRET_KEY, serviceId)
       .returns('secretKey')
       .withArgs(GLADYS_VARIABLES.APP_USERNAME, serviceId)
-      .returns('appUsername');
+      .returns('appUsername')
+      .withArgs(GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId)
+      .returns(null);
 
     await tuyaHandler.init();
 
     expect(tuyaHandler.status).to.eq(STATUS.CONNECTED);
 
-    assert.callCount(gladys.variable.getValue, 4);
+    assert.callCount(gladys.variable.getValue, 5);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ENDPOINT, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ACCESS_KEY, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.SECRET_KEY, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.APP_USERNAME, serviceId);
+    assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId);
 
     assert.calledOnce(client.init);
 
@@ -69,4 +72,28 @@ describe('TuyaHandler.init', () => {
       payload: { status: STATUS.CONNECTED, error: null },
     });
   });
+
+  it('should not connect when manual disconnect is enabled', async () => {
+    gladys.variable.getValue
+      .withArgs(GLADYS_VARIABLES.ENDPOINT, serviceId)
+      .returns('apiUrl')
+      .withArgs(GLADYS_VARIABLES.ACCESS_KEY, serviceId)
+      .returns('accessKey')
+      .withArgs(GLADYS_VARIABLES.SECRET_KEY, serviceId)
+      .returns('secretKey')
+      .withArgs(GLADYS_VARIABLES.APP_USERNAME, serviceId)
+      .returns('appUsername')
+      .withArgs(GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId)
+      .returns('1');
+
+    await tuyaHandler.init();
+
+    expect(tuyaHandler.status).to.eq(STATUS.NOT_INITIALIZED);
+
+    assert.notCalled(client.init);
+    assert.calledWith(gladys.event.emit, EVENTS.WEBSOCKET.SEND_ALL, {
+      type: WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS,
+      payload: { status: STATUS.NOT_INITIALIZED, manual_disconnect: true },
+    });
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.manualDisconnect.test.js b/server/test/services/tuya/lib/tuya.manualDisconnect.test.js
new file mode 100644
index 0000000000..7d1f0ffa55
--- /dev/null
+++ b/server/test/services/tuya/lib/tuya.manualDisconnect.test.js
@@ -0,0 +1,35 @@
+const sinon = require('sinon');
+
+const { assert } = sinon;
+
+const TuyaHandler = require('../../../../services/tuya/lib/index');
+const { GLADYS_VARIABLES } = require('../../../../services/tuya/lib/utils/tuya.constants');
+
+const gladys = {
+  variable: {
+    setValue: sinon.fake.resolves(null),
+  },
+};
+const serviceId = 'ffa13430-df93-488a-9733-5c540e9558e0';
+
+describe('TuyaHandler.manualDisconnect', () => {
+  const tuyaHandler = new TuyaHandler(gladys, serviceId);
+
+  beforeEach(() => {
+    sinon.reset();
+  });
+
+  afterEach(() => {
+    sinon.reset();
+  });
+
+  it('should persist manual disconnect and call disconnect', async () => {
+    const disconnectStub = sinon.stub().resolves(null);
+    tuyaHandler.disconnect = disconnectStub;
+
+    await tuyaHandler.manualDisconnect();
+
+    assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, true, serviceId);
+    assert.calledWith(disconnectStub, { manual: true });
+  });
+});
diff --git a/server/test/services/tuya/lib/tuya.saveConfiguration.test.js b/server/test/services/tuya/lib/tuya.saveConfiguration.test.js
index c7e41dc6ce..19e8105dc2 100644
--- a/server/test/services/tuya/lib/tuya.saveConfiguration.test.js
+++ b/server/test/services/tuya/lib/tuya.saveConfiguration.test.js
@@ -37,11 +37,12 @@ describe('TuyaHandler.saveConfiguration', () => {
 
     expect(config).to.deep.eq(configuration);
 
-    assert.callCount(gladys.variable.setValue, 5);
+    assert.callCount(gladys.variable.setValue, 6);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.ENDPOINT, 'endpoint', serviceId);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.ACCESS_KEY, 'accessKey', serviceId);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.SECRET_KEY, 'secretKey', serviceId);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.APP_ACCOUNT_UID, 'appAccountUID', serviceId);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.APP_USERNAME, 'user@example.com', serviceId);
+    assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, false, serviceId);
   });
 });

From 588225eadec050ddad16e1d2307bd7da756257ca Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 20 Feb 2026 22:03:21 +0100
Subject: [PATCH 21/90] =?UTF-8?q?feat(tuya):=20am=C3=A9liorer=20les=20test?=
 =?UTF-8?q?s=20pour=20la=20gestion=20des=20connexions=20et=20des=20erreurs?=
 =?UTF-8?q?=20de=20port?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/test/services/tuya/index.test.js       | 11 ++++++----
 .../lib/controllers/tuya.controller.test.js   | 18 ++++++++++++-----
 .../test/services/tuya/lib/tuya.init.test.js  |  1 +
 .../services/tuya/lib/tuya.localPoll.test.js  | 11 ++++++++++
 .../services/tuya/lib/tuya.localScan.test.js  | 20 ++++++++++++++-----
 5 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/server/test/services/tuya/index.test.js b/server/test/services/tuya/index.test.js
index bf08d1e33b..3a30d94d10 100644
--- a/server/test/services/tuya/index.test.js
+++ b/server/test/services/tuya/index.test.js
@@ -6,7 +6,9 @@ const { STATUS } = require('../../../services/tuya/lib/utils/tuya.constants');
 const { assert, fake } = sinon;
 
 const TuyaHandlerMock = sinon.stub();
-TuyaHandlerMock.prototype.init = fake.returns(null);
+TuyaHandlerMock.prototype.init = fake(function init() {
+  this.status = STATUS.CONNECTED;
+});
 TuyaHandlerMock.prototype.loadDevices = fake.returns(null);
 TuyaHandlerMock.prototype.disconnect = fake.returns(null);
 
@@ -16,14 +18,15 @@ const gladys = {};
 const serviceId = 'ffa13430-df93-488a-9733-5c540e9558e0';
 
 describe('TuyaService', () => {
-  const tuyaService = TuyaService(gladys, serviceId);
+  let tuyaService;
 
   beforeEach(() => {
-    sinon.reset();
+    sinon.resetHistory();
+    tuyaService = TuyaService(gladys, serviceId);
   });
 
   afterEach(() => {
-    sinon.reset();
+    sinon.resetHistory();
   });
 
   it('should start service', async () => {
diff --git a/server/test/services/tuya/lib/controllers/tuya.controller.test.js b/server/test/services/tuya/lib/controllers/tuya.controller.test.js
index 79b2b0e18f..9d8d3921b8 100644
--- a/server/test/services/tuya/lib/controllers/tuya.controller.test.js
+++ b/server/test/services/tuya/lib/controllers/tuya.controller.test.js
@@ -7,7 +7,7 @@ const { assert, fake } = sinon;
 const tuyaManager = {
   discoverDevices: fake.resolves([]),
   localPoll: fake.resolves({ dps: { 1: true } }),
-  localScan: fake.resolves({ device1: { ip: '1.1.1.1', version: '3.3' } }),
+  localScan: fake.resolves({ devices: { device1: { ip: '1.1.1.1', version: '3.3' } }, portErrors: {} }),
   discoveredDevices: [
     {
       external_id: 'tuya:device1',
@@ -21,7 +21,9 @@ describe('TuyaController GET /api/v1/service/tuya/discover', () => {
 
   beforeEach(() => {
     controller = TuyaController(tuyaManager);
-    sinon.reset();
+    sinon.resetHistory();
+    tuyaManager.localScan = fake.resolves({ devices: { device1: { ip: '1.1.1.1', version: '3.3' } }, portErrors: {} });
+    tuyaManager.discoveredDevices = [{ external_id: 'tuya:device1', params: [] }];
   });
 
   it('should return discovered devices', async () => {
@@ -41,7 +43,9 @@ describe('TuyaController POST /api/v1/service/tuya/local-poll', () => {
 
   beforeEach(() => {
     controller = TuyaController(tuyaManager);
-    sinon.reset();
+    sinon.resetHistory();
+    tuyaManager.localScan = fake.resolves({ devices: { device1: { ip: '1.1.1.1', version: '3.3' } }, portErrors: {} });
+    tuyaManager.discoveredDevices = [{ external_id: 'tuya:device1', params: [] }];
   });
 
   it('should return local poll result', async () => {
@@ -104,7 +108,9 @@ describe('TuyaController POST /api/v1/service/tuya/local-scan', () => {
 
   beforeEach(() => {
     controller = TuyaController(tuyaManager);
-    sinon.reset();
+    sinon.resetHistory();
+    tuyaManager.localScan = fake.resolves({ devices: { device1: { ip: '1.1.1.1', version: '3.3' } }, portErrors: {} });
+    tuyaManager.discoveredDevices = [{ external_id: 'tuya:device1', params: [] }];
   });
 
   it('should run local scan and return devices', async () => {
@@ -129,6 +135,7 @@ describe('TuyaController POST /api/v1/service/tuya/local-scan', () => {
     assert.calledOnce(tuyaManager.localScan);
     assert.calledWith(res.json, {
       local_devices: { device1: { ip: '1.1.1.1', version: '3.3' } },
+      port_errors: {},
     });
   });
 
@@ -137,7 +144,7 @@ describe('TuyaController POST /api/v1/service/tuya/local-scan', () => {
     const res = {
       json: fake.returns([]),
     };
-    tuyaManager.localScan = fake.resolves({});
+    tuyaManager.localScan = fake.resolves({ devices: {}, portErrors: {} });
     tuyaManager.discoveredDevices = [{ external_id: 'tuya:device1', params: [] }];
 
     await controller['post /api/v1/service/tuya/local-scan'].controller(req, res);
@@ -145,6 +152,7 @@ describe('TuyaController POST /api/v1/service/tuya/local-scan', () => {
     assert.calledWith(res.json, {
       devices: [{ external_id: 'tuya:device1', params: [] }],
       local_devices: {},
+      port_errors: {},
     });
   });
 });
diff --git a/server/test/services/tuya/lib/tuya.init.test.js b/server/test/services/tuya/lib/tuya.init.test.js
index 87d5ab57fc..460ed75c3f 100644
--- a/server/test/services/tuya/lib/tuya.init.test.js
+++ b/server/test/services/tuya/lib/tuya.init.test.js
@@ -17,6 +17,7 @@ const { EVENTS, WEBSOCKET_MESSAGE_TYPES } = require('../../../../utils/constants
 const gladys = {
   variable: {
     getValue: sinon.stub(),
+    setValue: sinon.stub().resolves(null),
   },
   event: {
     emit: fake.returns(null),
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index 86628213fb..9fdee7a21b 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -4,6 +4,12 @@ const { expect } = require('chai');
 const proxyquire = require('proxyquire').noCallThru();
 const { BadParameters } = require('../../../../utils/coreErrors');
 
+const attachEventHandlers = (instance) => {
+  instance.on = sinon.stub();
+  instance.once = sinon.stub();
+  instance.removeListener = sinon.stub();
+};
+
 describe('TuyaHandler.localPoll', () => {
   it('should throw if missing parameters', async () => {
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
@@ -27,6 +33,7 @@ describe('TuyaHandler.localPoll', () => {
       this.connect = connect;
       this.get = get;
       this.disconnect = disconnect;
+      attachEventHandlers(this);
     }
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: TuyAPIStub,
@@ -51,6 +58,7 @@ describe('TuyaHandler.localPoll', () => {
       this.connect = connect;
       this.get = get;
       this.disconnect = disconnect;
+      attachEventHandlers(this);
     }
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: TuyAPIStub,
@@ -83,6 +91,7 @@ describe('TuyaHandler.localPoll', () => {
       this.connect = connect;
       this.get = get;
       this.disconnect = disconnect;
+      attachEventHandlers(this);
     }
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: TuyAPIStub,
@@ -106,6 +115,7 @@ describe('TuyaHandler.localPoll', () => {
       this.connect = connect;
       this.get = get;
       this.disconnect = disconnect;
+      attachEventHandlers(this);
     }
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: TuyAPIStub,
@@ -134,6 +144,7 @@ describe('TuyaHandler.localPoll', () => {
       this.connect = connect;
       this.get = get;
       this.disconnect = disconnect;
+      attachEventHandlers(this);
     }
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: TuyAPIStub,
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index 7de5c2739e..0927236f7e 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -66,11 +66,14 @@ describe('TuyaHandler.localScan', () => {
     clock.restore();
 
     expect(result).to.deep.equal({
-      'device-id': {
-        ip: '1.1.1.1',
-        version: '3.3',
-        productKey: 'product-key',
+      devices: {
+        'device-id': {
+          ip: '1.1.1.1',
+          version: '3.3',
+          productKey: 'product-key',
+        },
       },
+      portErrors: {},
     });
   });
 
@@ -132,7 +135,14 @@ describe('TuyaHandler.localScan', () => {
     const result = await promise;
     clock.restore();
 
-    expect(result).to.deep.equal({});
+    expect(result).to.deep.equal({
+      devices: {},
+      portErrors: {
+        6666: 'boom',
+        6667: 'boom',
+        7000: 'boom',
+      },
+    });
   });
 
   it('should handle socket address errors on bind', async () => {

From cc0010e35005effb4f1a35c5635e52d9c469795c Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 21 Feb 2026 00:42:16 +0100
Subject: [PATCH 22/90] feat(tuya): enhance device discovery and local polling

- Implemented device ranking and sorting in DiscoverTab for better user experience.
- Added loading indicators and improved UI feedback during device scanning.
- Refactored local polling logic to update discovered devices with local information.
- Introduced utility functions for managing device parameters, including upserting and normalizing values.
- Enhanced local scan response handling to merge existing device parameters.
- Updated tests to cover new functionality and ensure reliability of device management.
---
 front/src/config/i18n/de.json                 |  10 +-
 front/src/config/i18n/en.json                 |  16 +-
 front/src/config/i18n/fr.json                 |  10 +-
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 238 +++++++++++++++---
 .../all/tuya/discover-page/DiscoverTab.jsx    |  86 +++++--
 .../all/tuya/discover-page/style.css          |   6 +
 server/services/tuya/api/tuya.controller.js   |  92 +------
 .../services/tuya/lib/tuya.discoverDevices.js |  23 +-
 server/services/tuya/lib/tuya.localPoll.js    |  53 +++-
 server/services/tuya/lib/tuya.localScan.js    |  49 ++++
 server/services/tuya/lib/tuya.setValue.js     |  15 +-
 .../tuya/lib/utils/tuya.deviceParams.js       |  93 +++++++
 .../services/tuya/lib/utils/tuya.normalize.js |   6 +
 .../tuya/lib/tuya.discoverDevices.test.js     |  27 +-
 .../services/tuya/lib/tuya.localPoll.test.js  | 150 +++++++++++
 .../services/tuya/lib/tuya.localScan.test.js  |  51 ++++
 .../tuya/lib/utils/tuya.deviceParams.test.js  | 127 ++++++++++
 17 files changed, 881 insertions(+), 171 deletions(-)
 create mode 100644 server/services/tuya/lib/utils/tuya.deviceParams.js
 create mode 100644 server/services/tuya/lib/utils/tuya.normalize.js
 create mode 100644 server/test/services/tuya/lib/utils/tuya.deviceParams.test.js

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index a0dbe13fc9..c2be8ba918 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1213,8 +1213,13 @@
         "localKeyLabel": "Lokaler Schlüssel",
         "protocolVersionLabel": "Protokollversion",
         "ipAddressLabel": "IP-Adresse",
-        "localInfoHelp": "Gib die lokale IP und die Protokollversion ein, wenn du den lokalen Modus nutzen willst. Die Cloud-IP wird zur Referenz gespeichert.",
+        "ipModeLocal": "Lokal",
+        "ipModeCloud": "Cloud",
+        "localInfoHelp": "Mit der Cloud/Lokal-Schaltfläche wählst du den Kommunikationsmodus. Im lokalen Modus kannst du die lokale IP bearbeiten. Im Cloud-Modus wird die Cloud-IP nur angezeigt (schreibgeschützt).",
         "localPollButton": "Lokales DPS abfragen",
+        "localPollInProgress": "Lokaler Poll läuft... Protokoll {{protocol}}.",
+        "localPollHelp": "Wenn du das Protokoll kennst, wähle es aus und klicke zum Prüfen. Wenn nicht, klicke direkt für einen vollständigen Scan (dauert länger).",
+        "localPollRequired": "Lokaler Modus ist aktiv und lokale Einstellungen wurden geändert. Bitte \"Lokales DPS abfragen\" erfolgreich ausführen, bevor du speicherst. Wenn der lokale Modus nicht funktioniert (z. B. Protokoll 3.5 noch nicht unterstützt), schalte zurück in den Cloud-Modus.",
         "localPollSuccess": "Lokaler Poll OK.",
         "localPollError": "Lokaler Poll fehlgeschlagen:",
         "protocol35Unsupported": "Protokoll 3.5 wird lokal noch nicht unterstützt.",
@@ -1227,6 +1232,9 @@
         "description": "Tuya-Geräte werden automatisch erkannt. Deine Tuya-Geräte müssen zuerst zu deinem Tuya-Cloud-Account hinzugefügt werden.",
         "localDiscoveryInfo": "Lokale Erkennung nutzt UDP-Broadcast. Starte den lokalen UDP-Scan und gib bei Bedarf lokale IP und Protokollversion ein und nutze \"Lokales DPS abfragen\".",
         "scanInProgress": "Scan läuft... Cloud-Geräte werden abgerufen.",
+        "scanCloudInProgress": "Scan läuft... Cloud-Geräte werden abgerufen. Das kann etwas dauern.",
+        "scanLocalInProgressConnected": "Scan läuft... Lokale Informationen der Geräte werden abgerufen. Das kann etwas dauern.",
+        "scanLocalInProgressDisconnected": "Scan läuft... Lokale Geräte werden abgerufen. Das kann etwas dauern.",
         "scanCloud": "Cloud-Scan",
         "localScanAuto": "Lokaler Auto-Scan",
         "udpScanError": "Fehler beim lokalen UDP-Scan.",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index 8396640d0e..be06288212 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1108,8 +1108,13 @@
         "localKeyLabel": "Local Key",
         "protocolVersionLabel": "Protocol Version",
         "ipAddressLabel": "IP Address",
-        "localInfoHelp": "Enter the local IP and protocol version if you want to use local mode. The cloud IP is kept for reference.",
+        "ipModeLocal": "Local",
+        "ipModeCloud": "Cloud",
+        "localInfoHelp": "Use the Cloud/Local button to choose the communication mode. Local mode lets you edit the local IP. Cloud mode shows the cloud IP (read-only).",
         "localPollButton": "Poll local DPS",
+        "localPollInProgress": "Local poll in progress (protocol {{protocol}})...",
+        "localPollHelp": "If you know the protocol, select it then click the button to verify. If you don't, just click the button for a full scan (it takes longer).",
+        "localPollRequired": "Local mode is enabled and local settings changed. Run \"Poll local DPS\" successfully before saving. If local mode can't work (e.g. protocol 3.5 not supported yet), switch back to cloud mode.",
         "localPollSuccess": "Local poll OK.",
         "localPollError": "Local poll failed:",
         "protocol35Unsupported": "Protocol 3.5 is not supported locally yet.",
@@ -1122,6 +1127,9 @@
         "description": "Tuya devices are automatically discovered. Your Tuya devices need to be added to your Tuya cloud account before.",
         "localDiscoveryInfo": "Local discovery uses UDP broadcast. Run the local UDP scan, then if needed enter the local IP and protocol version and use \"Poll local DPS\".",
         "scanInProgress": "Scan in progress... retrieving cloud devices.",
+        "scanCloudInProgress": "Scan in progress... retrieving cloud devices. This can take a while.",
+        "scanLocalInProgressConnected": "Scan in progress... retrieving local information for devices. This can take a while.",
+        "scanLocalInProgressDisconnected": "Scan in progress... retrieving local devices. This can take a while.",
         "scanCloud": "Cloud Scan",
         "localScanAuto": "Auto local scan",
         "udpScanError": "Error while running local UDP scan.",
@@ -1167,10 +1175,10 @@
         "connectionError": "Error while connecting, please check your configuration.",
         "notConfigured": "Tuya cloud connection details are missing or incomplete.",
         "connected": "Connected to the Tuya cloud account with success !",
-        "connectedAfterSave": "Connected to the Tuya cloud account with success !",
+        "connectedAfterSave": "Connected to the Tuya cloud account with success!",
         "connectedStatus": "Connected to the Tuya cloud account.",
-        "disconnectSuccess": "Disconnected from the Tuya cloud account with success ! Local service still works (it will not auto-reconnect when Gladys restarts).",
-        "disconnectedUnexpected": "You have been disconnected from the Tuya cloud! Please check your credentials and your <a href=\"https://eu.platform.tuya.com/cloud/products?productType=all\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Core</a> trial status.",
+        "disconnectSuccess": "Disconnected from the Tuya cloud account with success! Local service still works (it will not auto-reconnect when Gladys restarts).",
+        "disconnectedUnexpected": "You have been disconnected from the Tuya cloud! Please check your credentials and your <a href=\"https://platform.tuya.com/cloud/products?productType=all\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Core</a> trial status.",
         "disconnectedManual": "Disconnected from the Tuya cloud! Local service still works (it will not auto-reconnect when Gladys restarts).",
         "disconnectedMissingConfig": "Disconnected from the Tuya cloud.",
         "disconnectLabel": "Disconnect from cloud"
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index 2330767a9c..bd612ba74f 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1343,8 +1343,13 @@
         "localKeyLabel": "Clé locale",
         "protocolVersionLabel": "Version du protocole",
         "ipAddressLabel": "Adresse IP",
-        "localInfoHelp": "Saisissez l'IP locale et la version du protocole si vous souhaitez utiliser le mode local. L'IP cloud est conservée en référence.",
+        "ipModeLocal": "Local",
+        "ipModeCloud": "Cloud",
+        "localInfoHelp": "Utilisez le bouton Cloud/Local pour choisir le mode de communication. Le mode local permet de modifier l'IP locale. Le mode cloud affiche l'IP cloud (lecture seule).",
         "localPollButton": "Poll local des DP",
+        "localPollInProgress": "Poll local en cours... protocole {{protocol}}.",
+        "localPollHelp": "Si vous connaissez le protocole, sélectionnez-le puis cliquez pour vérifier. Sinon, cliquez directement pour un scan complet (plus long).",
+        "localPollRequired": "Le mode local est activé et les paramètres locaux ont changé. Lancez un poll local des DP avec succès avant de sauvegarder. Si vous n'arrivez pas à faire fonctionner le local (ex: protocole 3.5 non pris en charge), repassez en mode cloud.",
         "localPollSuccess": "Poll local OK.",
         "localPollError": "Échec du poll local :",
         "protocol35Unsupported": "Le protocole 3.5 n'est pas pris en charge en local pour le moment.",
@@ -1357,6 +1362,9 @@
         "description": "Les appareils Tuya sont automatiquement découverts. Vos appareils Tuya doivent être ajoutés à votre compte cloud Tuya avant.",
         "localDiscoveryInfo": "La découverte locale utilise le broadcast UDP. Lancez le scan UDP local puis, si besoin, renseignez l'IP locale et la version du protocole, et utilisez \"Poll local des DP\".",
         "scanInProgress": "Scan en cours... récupération cloud des appareils.",
+        "scanCloudInProgress": "Scan en cours... récupération cloud des appareils. Cela peut prendre un moment.",
+        "scanLocalInProgressConnected": "Scan en cours... récupération des informations locales des appareils. Cela peut prendre un moment.",
+        "scanLocalInProgressDisconnected": "Scan en cours... récupération des appareils en local. Cela peut prendre un moment.",
         "scanCloud": "Scan Cloud",
         "localScanAuto": "Scan local auto",
         "udpScanError": "Erreur lors du scan UDP local.",
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 5ae682eaca..9399427ea0 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -60,19 +60,133 @@ const createGithubUrl = (device, localPollStatus, localPollError) => {
   return `${GITHUB_BASE_URL}?title=${title}&body=${body}`;
 };
 
+const normalizeBoolean = value =>
+  value === true || value === 1 || value === '1' || value === 'true' || value === 'TRUE';
+
+const buildParamsMap = device =>
+  (Array.isArray(device && device.params) ? device.params : []).reduce((acc, param) => {
+    acc[param.name] = param.value;
+    return acc;
+  }, {});
+
+const buildComparableDevice = device => {
+  if (!device) {
+    return null;
+  }
+  const params = buildParamsMap(device);
+  const localOverrideRaw =
+    params.LOCAL_OVERRIDE !== undefined && params.LOCAL_OVERRIDE !== null
+      ? params.LOCAL_OVERRIDE
+      : device.local_override;
+  return {
+    name: device.name || '',
+    room_id: device.room_id || null,
+    ip: params.IP_ADDRESS || device.ip || '',
+    protocol: params.PROTOCOL_VERSION || device.protocol_version || '',
+    local_override: normalizeBoolean(localOverrideRaw)
+  };
+};
+
+const hasDeviceChanged = (device, baselineDevice) => {
+  const current = buildComparableDevice(device);
+  const baseline = buildComparableDevice(baselineDevice);
+  if (!current || !baseline) {
+    return false;
+  }
+  return (
+    current.name !== baseline.name ||
+    current.room_id !== baseline.room_id ||
+    current.ip !== baseline.ip ||
+    current.protocol !== baseline.protocol ||
+    current.local_override !== baseline.local_override
+  );
+};
+
+const getLocalConfig = device => {
+  if (!device) {
+    return {
+      ip: '',
+      protocol: '',
+      localOverride: false
+    };
+  }
+  const params = buildParamsMap(device);
+  const localOverrideRaw =
+    params.LOCAL_OVERRIDE !== undefined && params.LOCAL_OVERRIDE !== null
+      ? params.LOCAL_OVERRIDE
+      : device.local_override;
+  return {
+    ip: params.IP_ADDRESS || device.ip || '',
+    protocol: params.PROTOCOL_VERSION || device.protocol_version || '',
+    localOverride: normalizeBoolean(localOverrideRaw)
+  };
+};
+
+const hasLocalConfigChanged = (currentConfig, baselineConfig) =>
+  currentConfig.localOverride !== baselineConfig.localOverride ||
+  currentConfig.ip !== baselineConfig.ip ||
+  currentConfig.protocol !== baselineConfig.protocol;
+
+const isLocalPollValidated = (validation, currentConfig) =>
+  !!validation &&
+  validation.localOverride === true &&
+  validation.ip === currentConfig.ip &&
+  validation.protocol === currentConfig.protocol;
+
 class TuyaDeviceBox extends Component {
   componentWillMount() {
     this.setState({
-      device: this.props.device
+      device: this.props.device,
+      baselineDevice: this.props.device,
+      localPollValidation: null
     });
   }
 
   componentWillReceiveProps(nextProps) {
+    const currentDevice = this.state.device;
+    const nextDevice = nextProps.device;
+    const isNewDevice = !currentDevice || currentDevice.external_id !== nextDevice.external_id;
+    const baselineDevice = this.state.baselineDevice;
+    const shouldRefreshBaseline = isNewDevice || !baselineDevice || baselineDevice.updated_at !== nextDevice.updated_at;
+    if (isNewDevice) {
+      this.setState({
+        device: nextDevice,
+        baselineDevice: nextDevice,
+        localPollValidation: null
+      });
+      return;
+    }
     this.setState({
-      device: nextProps.device
+      device: nextDevice,
+      baselineDevice: shouldRefreshBaseline ? nextDevice : baselineDevice
     });
   }
 
+  toggleIpMode = () => {
+    const device = this.state.device;
+    const params = Array.isArray(device.params) ? [...device.params] : [];
+    const overrideParam = params.find(param => param.name === 'LOCAL_OVERRIDE');
+    const localOverrideRaw = overrideParam ? overrideParam.value : device.local_override;
+    const currentOverride = normalizeBoolean(localOverrideRaw);
+    const nextOverride = currentOverride !== true;
+    const existingIndex = params.findIndex(param => param.name === 'LOCAL_OVERRIDE');
+    if (existingIndex >= 0) {
+      params[existingIndex] = { ...params[existingIndex], value: nextOverride };
+    } else {
+      params.push({ name: 'LOCAL_OVERRIDE', value: nextOverride });
+    }
+    this.setState({
+      device: {
+        ...device,
+        params,
+        local_override: nextOverride
+      },
+      localPollValidation: null,
+      localPollStatus: null,
+      localPollError: null
+    });
+  };
+
   updateName = e => {
     this.setState({
       device: {
@@ -104,14 +218,18 @@ class TuyaDeviceBox extends Component {
       device: {
         ...this.state.device,
         params
-      }
+      },
+      localPollValidation: null,
+      localPollStatus: null,
+      localPollError: null
     });
   };
 
   pollLocal = async () => {
     this.setState({
       localPollStatus: RequestStatus.Getting,
-      localPollError: null
+      localPollError: null,
+      localPollProtocol: null
     });
     const params = Array.isArray(this.state.device.params) ? this.state.device.params : [];
     const getParam = name => {
@@ -128,11 +246,16 @@ class TuyaDeviceBox extends Component {
       for (let i = 0; i < protocolList.length; i += 1) {
         const protocolVersion = protocolList[i];
         try {
+          this.setState({
+            localPollProtocol: protocolVersion
+          });
           const response = await this.props.httpClient.post('/api/v1/service/tuya/local-poll', {
             deviceId: this.state.device.external_id && this.state.device.external_id.split(':')[1],
             ip: getParam('IP_ADDRESS') || this.state.device.ip,
             localKey: getParam('LOCAL_KEY') || this.state.device.local_key,
-            protocolVersion
+            protocolVersion,
+            timeoutMs: 3000,
+            fastScan: true
           });
           result = response && response.dps ? response : null;
           const updatedDevice = response && response.device ? response.device : null;
@@ -166,14 +289,21 @@ class TuyaDeviceBox extends Component {
           ...this.state.device,
           params: newParams
         },
-        localPollStatus: RequestStatus.Success
+        localPollStatus: RequestStatus.Success,
+        localPollProtocol: null,
+        localPollValidation: {
+          ip: getParam('IP_ADDRESS') || this.state.device.ip || '',
+          protocol: usedProtocol || '',
+          localOverride: true
+        }
       });
     } catch (e) {
       const message =
         (e && e.response && e.response.data && e.response.data.message) || (e && e.message) || 'Unknown error';
       this.setState({
         localPollStatus: RequestStatus.Error,
-        localPollError: message
+        localPollError: message,
+        localPollProtocol: null
       });
     }
   };
@@ -182,25 +312,19 @@ class TuyaDeviceBox extends Component {
     const ipAddress = e.target.value;
     const params = Array.isArray(this.state.device.params) ? [...this.state.device.params] : [];
     const existingIndex = params.findIndex(param => param.name === 'IP_ADDRESS');
-    const cloudIpParam = params.find(param => param.name === 'CLOUD_IP');
-    const cloudIp = cloudIpParam ? cloudIpParam.value : undefined;
     if (existingIndex >= 0) {
       params[existingIndex] = { ...params[existingIndex], value: ipAddress };
     } else {
       params.push({ name: 'IP_ADDRESS', value: ipAddress });
     }
-    const overrideValue = !!(ipAddress && cloudIp && ipAddress !== cloudIp);
-    const overrideIndex = params.findIndex(param => param.name === 'LOCAL_OVERRIDE');
-    if (overrideIndex >= 0) {
-      params[overrideIndex] = { ...params[overrideIndex], value: overrideValue };
-    } else {
-      params.push({ name: 'LOCAL_OVERRIDE', value: overrideValue });
-    }
     this.setState({
       device: {
         ...this.state.device,
         params
-      }
+      },
+      localPollValidation: null,
+      localPollStatus: null,
+      localPollError: null
     });
   };
 
@@ -212,7 +336,8 @@ class TuyaDeviceBox extends Component {
     try {
       const savedDevice = await this.props.httpClient.post(`/api/v1/device`, this.state.device);
       this.setState({
-        device: savedDevice
+        device: savedDevice,
+        baselineDevice: savedDevice
       });
     } catch (e) {
       let errorMessage = 'integration.tuya.error.defaultError';
@@ -268,7 +393,17 @@ class TuyaDeviceBox extends Component {
       alreadyCreatedButton,
       housesWithRooms
     },
-    { device, loading, errorMessage, tooMuchStatesError, statesNumber, localPollStatus, localPollError }
+    {
+      device,
+      loading,
+      errorMessage,
+      tooMuchStatesError,
+      statesNumber,
+      localPollStatus,
+      localPollError,
+      localPollProtocol,
+      localPollValidation
+    }
   ) {
     const validModel = device.features && device.features.length > 0;
     const online = device.online;
@@ -282,19 +417,31 @@ class TuyaDeviceBox extends Component {
     const productId = params.PRODUCT_ID || device.product_id || '';
     const productKey = params.PRODUCT_KEY || device.product_key || '';
     const protocolVersion = params.PROTOCOL_VERSION || device.protocol_version || '';
-    const localOverride =
+    const localOverrideRaw =
       params.LOCAL_OVERRIDE !== undefined && params.LOCAL_OVERRIDE !== null
         ? params.LOCAL_OVERRIDE
         : device.local_override;
+    const localOverride = normalizeBoolean(localOverrideRaw);
     const ipAddress = params.IP_ADDRESS || device.ip || '';
     const cloudIp = params.CLOUD_IP || device.cloud_ip || '';
-    const hasProtocolSelected = protocolVersion && protocolVersion.length > 0;
+    const showCloudIp = localOverride !== true;
+    const displayIp = showCloudIp ? cloudIp : ipAddress;
     const isValidIp =
       typeof ipAddress === 'string' && /^(25[0-5]|2[0-4]\d|1?\d?\d)(\.(25[0-5]|2[0-4]\d|1?\d?\d)){3}$/.test(ipAddress);
     const isDifferentFromCloud = !cloudIp || ipAddress !== cloudIp;
-    const canPollLocal = isValidIp && localKey && isDifferentFromCloud;
-    const requiresProtocol = localOverride === true;
-    const canSave = !requiresProtocol || hasProtocolSelected;
+    const canPollLocal = localOverride === true && isValidIp && localKey && isDifferentFromCloud;
+    const hasLocalChanges = hasDeviceChanged(device, this.state.baselineDevice);
+    const currentLocalConfig = getLocalConfig(device);
+    const baselineLocalConfig = getLocalConfig(this.state.baselineDevice);
+    const localConfigChanged = hasLocalConfigChanged(currentLocalConfig, baselineLocalConfig);
+    const requiresLocalPollValidation = currentLocalConfig.localOverride === true && localConfigChanged;
+    const localPollValidated = isLocalPollValidated(localPollValidation, currentLocalConfig);
+    const canSave = !requiresLocalPollValidation || localPollValidated;
+    const isDiscoverPage = !deleteButton;
+    const showUpdateButton =
+      validModel && isDiscoverPage && (updateButton || (alreadyCreatedButton && hasLocalChanges));
+    const showAlreadyCreatedButton = validModel && alreadyCreatedButton && !hasLocalChanges;
+    const pollProtocolLabel = localPollProtocol || protocolVersion || '-';
 
     return (
       <div class="col-md-6">
@@ -413,14 +560,21 @@ class TuyaDeviceBox extends Component {
                   <label class="form-label" for={`ip_${deviceIndex}`}>
                     <Text id="integration.tuya.device.ipAddressLabel" />
                   </label>
-                  <input
-                    id={`ip_${deviceIndex}`}
-                    type="text"
-                    value={ipAddress}
-                    class="form-control"
-                    onInput={this.updateIpAddress}
-                    disabled={!editable}
-                  />
+                  <div class="input-group">
+                    <input
+                      id={`ip_${deviceIndex}`}
+                      type="text"
+                      value={displayIp}
+                      class="form-control"
+                      onInput={!showCloudIp ? this.updateIpAddress : undefined}
+                      disabled={showCloudIp}
+                    />
+                    <div class="input-group-append">
+                      <button class="btn btn-outline-secondary" type="button" onClick={this.toggleIpMode}>
+                        <Text id={`integration.tuya.device.${showCloudIp ? 'ipModeCloud' : 'ipModeLocal'}`} />
+                      </button>
+                    </div>
+                  </div>
                   <small class="form-text text-muted">
                     <Text id="integration.tuya.device.localInfoHelp" />
                   </small>
@@ -435,7 +589,7 @@ class TuyaDeviceBox extends Component {
                     class="form-control"
                     value={protocolVersion}
                     onChange={this.updateProtocol}
-                    disabled={!editable}
+                    disabled={showCloudIp}
                   >
                     <option value="">
                       <Text id="global.emptySelectOption" />
@@ -460,6 +614,12 @@ class TuyaDeviceBox extends Component {
                   >
                     <Text id="integration.tuya.device.localPollButton" />
                   </button>
+                  {localPollStatus === RequestStatus.Getting && (
+                    <span class="text-muted ml-2">
+                      <span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true" />
+                      <Text id="integration.tuya.device.localPollInProgress" fields={{ protocol: pollProtocolLabel }} />
+                    </span>
+                  )}
                   {localPollStatus === RequestStatus.Success && (
                     <span class="text-success ml-2">
                       <Text id="integration.tuya.device.localPollSuccess" />
@@ -470,6 +630,9 @@ class TuyaDeviceBox extends Component {
                       <Text id="integration.tuya.device.localPollError" /> {localPollError}
                     </span>
                   )}
+                  <small class="form-text text-muted mt-2">
+                    <Text id="integration.tuya.device.localPollHelp" />
+                  </small>
                 </div>
 
                 <div class="form-group">
@@ -508,13 +671,18 @@ class TuyaDeviceBox extends Component {
                 )}
 
                 <div class="form-group">
-                  {validModel && alreadyCreatedButton && (
+                  {requiresLocalPollValidation && !localPollValidated && (
+                    <div class="text-muted mb-2">
+                      <Text id="integration.tuya.device.localPollRequired" />
+                    </div>
+                  )}
+                  {showAlreadyCreatedButton && (
                     <button class="btn btn-primary mr-2" disabled="true">
                       <Text id="integration.tuya.alreadyCreatedButton" />
                     </button>
                   )}
 
-                  {validModel && updateButton && (
+                  {showUpdateButton && (
                     <button onClick={this.saveDevice} class="btn btn-success mr-2" disabled={!canSave}>
                       <Text id="integration.tuya.updateButton" />
                     </button>
diff --git a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
index c1f3f3c3cc..47f7dfc729 100644
--- a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
+++ b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
@@ -9,6 +9,42 @@ import { connect } from 'unistore/preact';
 import { Component } from 'preact';
 import { RequestStatus } from '../../../../../utils/consts';
 
+const getDeviceRank = device => {
+  const isCreated = !!device.created_at;
+  const hasFeatures = device.features && device.features.length > 0;
+  const isUpdatable = !!device.updatable;
+  if (!isCreated && hasFeatures) {
+    return 0;
+  }
+  if (isCreated && isUpdatable) {
+    return 1;
+  }
+  if (!isCreated && !hasFeatures) {
+    return 2;
+  }
+  if (isCreated && !isUpdatable) {
+    return 3;
+  }
+  return 4;
+};
+
+const sortDevices = devices =>
+  [...devices].sort((a, b) => {
+    const rankDiff = getDeviceRank(a) - getDeviceRank(b);
+    if (rankDiff !== 0) {
+      return rankDiff;
+    }
+    const nameA = (a.name || '').toLowerCase();
+    const nameB = (b.name || '').toLowerCase();
+    if (nameA < nameB) {
+      return -1;
+    }
+    if (nameA > nameB) {
+      return 1;
+    }
+    return 0;
+  });
+
 class DiscoverTab extends Component {
   async componentWillMount() {
     this.getDiscoveredDevices();
@@ -88,7 +124,18 @@ class DiscoverTab extends Component {
     { loading, errorLoading, discoveredDevices, housesWithRooms, udpScanLoading, udpScanError, udpScanPortErrors }
   ) {
     const canScanCloud = !errorLoading;
+    const isLoading = loading || udpScanLoading;
+    const localScanTextId = errorLoading
+      ? 'integration.tuya.discover.scanLocalInProgressDisconnected'
+      : 'integration.tuya.discover.scanLocalInProgressConnected';
+    const scanTextId = udpScanLoading
+      ? localScanTextId
+      : loading
+      ? 'integration.tuya.discover.scanCloudInProgress'
+      : null;
     const portErrorPorts = udpScanPortErrors ? Object.keys(udpScanPortErrors) : [];
+    const orderedDevices = Array.isArray(discoveredDevices) ? sortDevices(discoveredDevices) : [];
+
     return (
       <div class="card">
         <div class="card-header">
@@ -116,11 +163,6 @@ class DiscoverTab extends Component {
           <div class="alert alert-info">
             <Text id="integration.tuya.discover.localDiscoveryInfo" />
           </div>
-          {loading && (
-            <div class="alert alert-info">
-              <Text id="integration.tuya.discover.scanInProgress" />
-            </div>
-          )}
           <div class="alert alert-secondary">
             <Text id="integration.tuya.discover.description" />
           </div>
@@ -129,6 +171,12 @@ class DiscoverTab extends Component {
               <Text id="integration.tuya.discover.udpScanError" />
             </div>
           )}
+          {isLoading && scanTextId && (
+            <div class={cx('alert alert-info', style.scanLoader)}>
+              <div class="loader" />
+              <Text id={scanTextId} />
+            </div>
+          )}
           {portErrorPorts.length > 0 && (
             <div class="alert alert-warning">
               <Localizer>
@@ -144,10 +192,9 @@ class DiscoverTab extends Component {
           )}
           <div
             class={cx('dimmer', {
-              active: loading || udpScanLoading
+              active: isLoading
             })}
           >
-            <div class="loader" />
             <div class={cx('dimmer-content', style.tuyaListBody)}>
               {errorLoading && (
                 <p class="alert alert-warning">
@@ -158,19 +205,18 @@ class DiscoverTab extends Component {
                 </p>
               )}
               <div class="row">
-                {discoveredDevices &&
-                  discoveredDevices.map((device, index) => (
-                    <TuyaDeviceBox
-                      editable={!device.created_at || device.updatable}
-                      alreadyCreatedButton={device.created_at && !device.updatable}
-                      updateButton={device.updatable}
-                      saveButton={!device.created_at}
-                      device={device}
-                      deviceIndex={index}
-                      housesWithRooms={housesWithRooms}
-                    />
-                  ))}
-                {!discoveredDevices || (discoveredDevices.length === 0 && <EmptyState />)}
+                {orderedDevices.map((device, index) => (
+                  <TuyaDeviceBox
+                    editable={!device.created_at || device.updatable}
+                    alreadyCreatedButton={device.created_at && !device.updatable}
+                    updateButton={device.updatable}
+                    saveButton={!device.created_at}
+                    device={device}
+                    deviceIndex={index}
+                    housesWithRooms={housesWithRooms}
+                  />
+                ))}
+                {orderedDevices.length === 0 && <EmptyState />}
               </div>
             </div>
           </div>
diff --git a/front/src/routes/integration/all/tuya/discover-page/style.css b/front/src/routes/integration/all/tuya/discover-page/style.css
index 0ce9311518..b226dd9f9e 100644
--- a/front/src/routes/integration/all/tuya/discover-page/style.css
+++ b/front/src/routes/integration/all/tuya/discover-page/style.css
@@ -5,3 +5,9 @@
 .tuyaListBody {
   min-height: 200px;
 }
+
+.scanLoader {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
diff --git a/server/services/tuya/api/tuya.controller.js b/server/services/tuya/api/tuya.controller.js
index 0270b2e9b0..cced2fb982 100644
--- a/server/services/tuya/api/tuya.controller.js
+++ b/server/services/tuya/api/tuya.controller.js
@@ -1,47 +1,9 @@
 const asyncMiddleware = require('../../../api/middlewares/asyncMiddleware');
 const logger = require('../../../utils/logger');
-const { DEVICE_PARAM_NAME } = require('../lib/utils/tuya.constants');
+const { updateDiscoveredDeviceAfterLocalPoll } = require('../lib/tuya.localPoll');
+const { buildLocalScanResponse } = require('../lib/tuya.localScan');
 
 module.exports = function TuyaController(tuyaManager) {
-  /**
-   * @description Upsert a device parameter in a params array.
-   * @param {Array} params - Device params.
-   * @param {string} name - Param name.
-   * @param {*} value - Param value.
-   * @returns {void}
-   */
-  function upsertParam(params, name, value) {
-    if (value === undefined || value === null) {
-      return;
-    }
-    const index = params.findIndex((param) => param.name === name);
-    if (index >= 0) {
-      params[index] = { ...params[index], value };
-    } else {
-      params.push({ name, value });
-    }
-  }
-
-  /**
-   * @description Merge local scan data into a discovered device.
-   * @param {object} device - Discovered device.
-   * @param {object} localInfo - Local scan info.
-   * @returns {object} Updated device.
-   */
-  function updateDiscoveredDeviceWithLocalInfo(device, localInfo) {
-    if (!device || !localInfo) {
-      return device;
-    }
-    const updated = { ...device };
-    updated.protocol_version = localInfo.version;
-    updated.ip = localInfo.ip || updated.ip;
-    updated.product_key = localInfo.productKey;
-    updated.params = Array.isArray(updated.params) ? [...updated.params] : [];
-    upsertParam(updated.params, DEVICE_PARAM_NAME.IP_ADDRESS, updated.ip);
-    upsertParam(updated.params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, updated.protocol_version);
-    upsertParam(updated.params, DEVICE_PARAM_NAME.PRODUCT_KEY, updated.product_key);
-    return updated;
-  }
   /**
    * @api {get} /api/v1/service/tuya/discover Retrieve tuya devices from cloud.
    * @apiName discover
@@ -59,32 +21,7 @@ module.exports = function TuyaController(tuyaManager) {
    */
   async function localPoll(req, res) {
     const result = await tuyaManager.localPoll(req.body);
-    const { deviceId, ip, protocolVersion, localKey } = req.body || {};
-
-    let updatedDevice = null;
-    if (deviceId && Array.isArray(tuyaManager.discoveredDevices)) {
-      const externalId = `tuya:${deviceId}`;
-      const deviceIndex = tuyaManager.discoveredDevices.findIndex((device) => device.external_id === externalId);
-      if (deviceIndex >= 0) {
-        const device = { ...tuyaManager.discoveredDevices[deviceIndex] };
-        device.protocol_version = protocolVersion;
-        device.ip = ip;
-        device.local_override = true;
-        if (localKey) {
-          device.local_key = localKey;
-        }
-        device.params = Array.isArray(device.params) ? [...device.params] : [];
-        upsertParam(device.params, DEVICE_PARAM_NAME.IP_ADDRESS, ip);
-        upsertParam(device.params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, protocolVersion);
-        upsertParam(device.params, DEVICE_PARAM_NAME.LOCAL_KEY, localKey);
-        upsertParam(device.params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE, true);
-        upsertParam(device.params, DEVICE_PARAM_NAME.PRODUCT_ID, device.product_id);
-        upsertParam(device.params, DEVICE_PARAM_NAME.PRODUCT_KEY, device.product_key);
-
-        tuyaManager.discoveredDevices[deviceIndex] = device;
-        updatedDevice = device;
-      }
-    }
+    const updatedDevice = updateDiscoveredDeviceAfterLocalPoll(tuyaManager, req.body);
 
     if (updatedDevice) {
       res.json({
@@ -108,28 +45,7 @@ module.exports = function TuyaController(tuyaManager) {
     const localScanResult = await tuyaManager.localScan({
       timeoutSeconds,
     });
-    const localDevicesById = localScanResult.devices || {};
-    const portErrors = localScanResult.portErrors || {};
-
-    if (Array.isArray(tuyaManager.discoveredDevices)) {
-      const updatedDevices = tuyaManager.discoveredDevices.map((device) => {
-        const deviceId = device.external_id && device.external_id.split(':')[1];
-        const localInfo = localDevicesById[deviceId];
-        return updateDiscoveredDeviceWithLocalInfo(device, localInfo);
-      });
-      tuyaManager.discoveredDevices = updatedDevices;
-      res.json({
-        devices: updatedDevices,
-        local_devices: localDevicesById,
-        port_errors: portErrors,
-      });
-      return;
-    }
-
-    res.json({
-      local_devices: localDevicesById,
-      port_errors: portErrors,
-    });
+    res.json(buildLocalScanResponse(tuyaManager, localScanResult));
   }
 
   /**
diff --git a/server/services/tuya/lib/tuya.discoverDevices.js b/server/services/tuya/lib/tuya.discoverDevices.js
index 35e4a9f395..5b6a261577 100644
--- a/server/services/tuya/lib/tuya.discoverDevices.js
+++ b/server/services/tuya/lib/tuya.discoverDevices.js
@@ -1,9 +1,11 @@
 const logger = require('../../../utils/logger');
 const { ServiceNotConfiguredError } = require('../../../utils/coreErrors');
 const { WEBSOCKET_MESSAGE_TYPES, EVENTS } = require('../../../utils/constants');
+const { mergeDevices } = require('../../../utils/device');
 
 const { STATUS } = require('./utils/tuya.constants');
 const { convertDevice } = require('./device/tuya.convertDevice');
+const { applyExistingLocalParams, normalizeExistingDevice } = require('./utils/tuya.deviceParams');
 
 /**
  * @description Discover Tuya cloud devices.
@@ -47,6 +49,8 @@ async function discoverDevices() {
     return {
       ...device,
       cloud_ip: cloudIp,
+      ip: null,
+      protocol_version: null,
       local_override: false,
     };
   });
@@ -56,11 +60,24 @@ async function discoverDevices() {
       ...convertDevice(device),
       service_id: this.serviceId,
     }))
-    .filter((device) => {
-      const existInGladys = this.gladys.stateManager.get('deviceByExternalId', device.external_id);
-      return existInGladys === null;
+    .map((device) => {
+      const existing = normalizeExistingDevice(this.gladys.stateManager.get('deviceByExternalId', device.external_id));
+      const deviceWithLocalParams = applyExistingLocalParams(device, existing);
+      return mergeDevices(deviceWithLocalParams, existing);
     });
 
+  try {
+    const existingDevices = await this.gladys.device.get({ service: 'tuya' });
+    const discoveredByExternalId = new Map(this.discoveredDevices.map((device) => [device.external_id, device]));
+    existingDevices.forEach((device) => {
+      if (device && device.external_id && !discoveredByExternalId.has(device.external_id)) {
+        this.discoveredDevices.push({ ...device, updatable: false });
+      }
+    });
+  } catch (e) {
+    logger.warn('Unable to load existing Tuya devices from Gladys', e);
+  }
+
   this.status = STATUS.CONNECTED;
 
   this.gladys.event.emit(EVENTS.WEBSOCKET.SEND_ALL, {
diff --git a/server/services/tuya/lib/tuya.localPoll.js b/server/services/tuya/lib/tuya.localPoll.js
index 7dc4c8279f..faffd522ec 100644
--- a/server/services/tuya/lib/tuya.localPoll.js
+++ b/server/services/tuya/lib/tuya.localPoll.js
@@ -1,6 +1,9 @@
 const TuyAPI = require('tuyapi');
 const logger = require('../../../utils/logger');
 const { BadParameters } = require('../../../utils/coreErrors');
+const { mergeDevices } = require('../../../utils/device');
+const { DEVICE_PARAM_NAME } = require('./utils/tuya.constants');
+const { normalizeExistingDevice, upsertParam } = require('./utils/tuya.deviceParams');
 
 /**
  * @description Poll a Tuya device locally to retrieve DPS map.
@@ -10,8 +13,8 @@ const { BadParameters } = require('../../../utils/coreErrors');
  * await localPoll({ deviceId: 'id', ip: '1.1.1.1', localKey: 'key', protocolVersion: '3.3' });
  */
 async function localPoll(payload) {
-  const { deviceId, ip, localKey, protocolVersion, timeoutMs = 8000, fastScan = false } = payload || {};
-  const effectiveTimeout = protocolVersion === '3.5' && !fastScan ? Math.max(timeoutMs, 15000) : timeoutMs;
+  const { deviceId, ip, localKey, protocolVersion, timeoutMs = 3000, fastScan = false } = payload || {};
+  const effectiveTimeout = protocolVersion === '3.5' && !fastScan ? Math.max(timeoutMs, 5000) : timeoutMs;
 
   if (!deviceId || !ip || !localKey || !protocolVersion) {
     throw new BadParameters('Missing local connection parameters');
@@ -112,6 +115,52 @@ async function localPoll(payload) {
   }
 }
 
+/**
+ * @description Update discovered device list after a successful local poll.
+ * @param {object} tuyaManager - Tuya handler instance.
+ * @param {object} payload - Local poll payload.
+ * @returns {object|null} Updated device when found.
+ * @example
+ * updateDiscoveredDeviceAfterLocalPoll(tuyaManager, { deviceId: 'id', ip: '1.1.1.1', protocolVersion: '3.3' });
+ */
+function updateDiscoveredDeviceAfterLocalPoll(tuyaManager, payload) {
+  const { deviceId, ip, protocolVersion, localKey } = payload || {};
+  if (!deviceId || !tuyaManager || !Array.isArray(tuyaManager.discoveredDevices)) {
+    return null;
+  }
+  const externalId = `tuya:${deviceId}`;
+  const deviceIndex = tuyaManager.discoveredDevices.findIndex((device) => device.external_id === externalId);
+  if (deviceIndex < 0) {
+    return null;
+  }
+
+  let device = { ...tuyaManager.discoveredDevices[deviceIndex] };
+  device.protocol_version = protocolVersion;
+  device.ip = ip;
+  device.local_override = true;
+  if (localKey) {
+    device.local_key = localKey;
+  }
+  device.params = Array.isArray(device.params) ? [...device.params] : [];
+  upsertParam(device.params, DEVICE_PARAM_NAME.IP_ADDRESS, ip);
+  upsertParam(device.params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, protocolVersion);
+  upsertParam(device.params, DEVICE_PARAM_NAME.LOCAL_KEY, localKey);
+  upsertParam(device.params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE, true);
+  upsertParam(device.params, DEVICE_PARAM_NAME.PRODUCT_ID, device.product_id);
+  upsertParam(device.params, DEVICE_PARAM_NAME.PRODUCT_KEY, device.product_key);
+
+  if (tuyaManager.gladys && tuyaManager.gladys.stateManager) {
+    const existing = normalizeExistingDevice(
+      tuyaManager.gladys.stateManager.get('deviceByExternalId', device.external_id),
+    );
+    device = mergeDevices(device, existing);
+  }
+
+  tuyaManager.discoveredDevices[deviceIndex] = device;
+  return device;
+}
+
 module.exports = {
   localPoll,
+  updateDiscoveredDeviceAfterLocalPoll,
 };
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index df55322d17..a790562e61 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -2,6 +2,12 @@ const dgram = require('dgram');
 const { UDP_KEY } = require('tuyapi/lib/config');
 const { MessageParser } = require('tuyapi/lib/message-parser');
 const logger = require('../../../utils/logger');
+const { mergeDevices } = require('../../../utils/device');
+const {
+  applyExistingLocalOverride,
+  normalizeExistingDevice,
+  updateDiscoveredDeviceWithLocalInfo,
+} = require('./utils/tuya.deviceParams');
 
 const DEFAULT_PORTS = [6666, 6667, 7000];
 const formatHex = (buffer, maxLen = 128) => {
@@ -121,6 +127,49 @@ async function localScan(input = 10) {
   return { devices, portErrors };
 }
 
+/**
+ * @description Build local scan response and update discovered devices.
+ * @param {object} tuyaManager - Tuya handler instance.
+ * @param {object} localScanResult - Result of UDP scan.
+ * @returns {object} API response payload.
+ * @example
+ * buildLocalScanResponse(tuyaManager, { devices: {}, portErrors: {} });
+ */
+function buildLocalScanResponse(tuyaManager, localScanResult) {
+  const localDevicesById = (localScanResult && localScanResult.devices) || {};
+  const portErrors = (localScanResult && localScanResult.portErrors) || {};
+
+  if (tuyaManager && Array.isArray(tuyaManager.discoveredDevices)) {
+    const updatedDevices = tuyaManager.discoveredDevices.map((device) => {
+      const deviceId = device.external_id && device.external_id.split(':')[1];
+      const localInfo = localDevicesById[deviceId];
+      return updateDiscoveredDeviceWithLocalInfo(device, localInfo);
+    });
+    const mergedDevices = updatedDevices.map((device) => {
+      if (!tuyaManager.gladys || !tuyaManager.gladys.stateManager) {
+        return device;
+      }
+      const existing = normalizeExistingDevice(
+        tuyaManager.gladys.stateManager.get('deviceByExternalId', device.external_id),
+      );
+      const withLocalOverride = applyExistingLocalOverride(device, existing);
+      return mergeDevices(withLocalOverride, existing);
+    });
+    tuyaManager.discoveredDevices = mergedDevices;
+    return {
+      devices: mergedDevices,
+      local_devices: localDevicesById,
+      port_errors: portErrors,
+    };
+  }
+
+  return {
+    local_devices: localDevicesById,
+    port_errors: portErrors,
+  };
+}
+
 module.exports = {
   localScan,
+  buildLocalScanResponse,
 };
diff --git a/server/services/tuya/lib/tuya.setValue.js b/server/services/tuya/lib/tuya.setValue.js
index 2b97de18ca..cb1b658e45 100644
--- a/server/services/tuya/lib/tuya.setValue.js
+++ b/server/services/tuya/lib/tuya.setValue.js
@@ -4,22 +4,13 @@ const { API } = require('./utils/tuya.constants');
 const { BadParameters } = require('../../../utils/coreErrors');
 const { writeValues } = require('./device/tuya.deviceMapping');
 const { DEVICE_PARAM_NAME } = require('./utils/tuya.constants');
+const { normalizeBoolean } = require('./utils/tuya.normalize');
 
 const getParamValue = (params, name) => {
   const found = (params || []).find((param) => param.name === name);
   return found ? found.value : undefined;
 };
 
-const normalizeBoolean = (value) => {
-  if (value === true || value === 'true') {
-    return true;
-  }
-  if (value === false || value === 'false') {
-    return false;
-  }
-  return undefined;
-};
-
 const getLocalDpsFromCode = (code) => {
   if (!code) {
     return null;
@@ -62,11 +53,9 @@ async function setValue(device, deviceFeature, value) {
   const ipAddress = getParamValue(params, DEVICE_PARAM_NAME.IP_ADDRESS);
   const localKey = getParamValue(params, DEVICE_PARAM_NAME.LOCAL_KEY);
   const protocolVersion = getParamValue(params, DEVICE_PARAM_NAME.PROTOCOL_VERSION);
-  const cloudIp = getParamValue(params, DEVICE_PARAM_NAME.CLOUD_IP);
   const localOverride = normalizeBoolean(getParamValue(params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE));
 
-  const hasLocalConfig =
-    ipAddress && localKey && protocolVersion && (localOverride === true || (cloudIp && ipAddress !== cloudIp));
+  const hasLocalConfig = ipAddress && localKey && protocolVersion && localOverride === true;
 
   const localDps = getLocalDpsFromCode(command);
 
diff --git a/server/services/tuya/lib/utils/tuya.deviceParams.js b/server/services/tuya/lib/utils/tuya.deviceParams.js
new file mode 100644
index 0000000000..6cd7f5fd89
--- /dev/null
+++ b/server/services/tuya/lib/utils/tuya.deviceParams.js
@@ -0,0 +1,93 @@
+const { DEVICE_PARAM_NAME } = require('./tuya.constants');
+const { normalizeBoolean } = require('./tuya.normalize');
+
+const upsertParam = (params, name, value) => {
+  if (value === undefined || value === null) {
+    return;
+  }
+  const index = params.findIndex((param) => param.name === name);
+  if (index >= 0) {
+    params[index] = { ...params[index], value };
+  } else {
+    params.push({ name, value });
+  }
+};
+
+const normalizeExistingDevice = (device) => {
+  if (!device || !Array.isArray(device.params)) {
+    return device;
+  }
+  const normalizedParams = device.params.map((param) =>
+    param.name === DEVICE_PARAM_NAME.LOCAL_OVERRIDE ? { ...param, value: normalizeBoolean(param.value) } : param,
+  );
+  return { ...device, params: normalizedParams };
+};
+
+const updateDiscoveredDeviceWithLocalInfo = (device, localInfo) => {
+  if (!device || !localInfo) {
+    return device;
+  }
+  const updated = { ...device };
+  updated.protocol_version = localInfo.version;
+  updated.ip = localInfo.ip || updated.ip;
+  updated.product_key = localInfo.productKey;
+  updated.params = Array.isArray(updated.params) ? [...updated.params] : [];
+  upsertParam(updated.params, DEVICE_PARAM_NAME.IP_ADDRESS, updated.ip);
+  upsertParam(updated.params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, updated.protocol_version);
+  upsertParam(updated.params, DEVICE_PARAM_NAME.PRODUCT_KEY, updated.product_key);
+  return updated;
+};
+
+const getExistingParamValue = (existingDevice, name) => {
+  if (!existingDevice || !Array.isArray(existingDevice.params)) {
+    return undefined;
+  }
+  const param = existingDevice.params.find((item) => item.name === name);
+  return param ? param.value : undefined;
+};
+
+const applyExistingLocalParams = (device, existingDevice) => {
+  if (!existingDevice) {
+    return device;
+  }
+  const params = Array.isArray(device.params) ? [...device.params] : [];
+  const ipValue = getExistingParamValue(existingDevice, DEVICE_PARAM_NAME.IP_ADDRESS);
+  const protocolValue = getExistingParamValue(existingDevice, DEVICE_PARAM_NAME.PROTOCOL_VERSION);
+  const localOverrideValue = getExistingParamValue(existingDevice, DEVICE_PARAM_NAME.LOCAL_OVERRIDE);
+
+  upsertParam(params, DEVICE_PARAM_NAME.IP_ADDRESS, ipValue);
+  upsertParam(params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, protocolValue);
+  upsertParam(params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE, localOverrideValue);
+
+  return {
+    ...device,
+    params,
+    ip: ipValue !== undefined && ipValue !== null ? ipValue : device.ip,
+    protocol_version: protocolValue !== undefined && protocolValue !== null ? protocolValue : device.protocol_version,
+    local_override:
+      localOverrideValue !== undefined && localOverrideValue !== null ? localOverrideValue : device.local_override,
+  };
+};
+
+const applyExistingLocalOverride = (device, existingDevice) => {
+  if (!existingDevice || !Array.isArray(existingDevice.params)) {
+    return device;
+  }
+  const overrideParam = existingDevice.params.find((param) => param.name === DEVICE_PARAM_NAME.LOCAL_OVERRIDE);
+  if (!overrideParam) {
+    return device;
+  }
+  const updated = { ...device };
+  updated.params = Array.isArray(updated.params) ? [...updated.params] : [];
+  upsertParam(updated.params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE, overrideParam.value);
+  updated.local_override = overrideParam.value;
+  return updated;
+};
+
+module.exports = {
+  applyExistingLocalOverride,
+  applyExistingLocalParams,
+  normalizeExistingDevice,
+  updateDiscoveredDeviceWithLocalInfo,
+  upsertParam,
+};
diff --git a/server/services/tuya/lib/utils/tuya.normalize.js b/server/services/tuya/lib/utils/tuya.normalize.js
new file mode 100644
index 0000000000..c087ed10a2
--- /dev/null
+++ b/server/services/tuya/lib/utils/tuya.normalize.js
@@ -0,0 +1,6 @@
+const normalizeBoolean = (value) =>
+  value === true || value === 1 || value === '1' || value === 'true' || value === 'TRUE';
+
+module.exports = {
+  normalizeBoolean,
+};
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index c6d5a5eb77..3955478808 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -18,6 +18,9 @@ const gladys = {
   variable: {
     getValue: fake.resolves('APP_ACCOUNT_UID'),
   },
+  device: {
+    get: fake.resolves([]),
+  },
 };
 const serviceId = 'ffa13430-df93-488a-9733-5c540e9558e0';
 
@@ -157,10 +160,6 @@ describe('TuyaHandler.discoverDevices', () => {
             name: 'LOCAL_KEY',
             value: 'localKey',
           },
-          {
-            name: 'IP_ADDRESS',
-            value: '1.1.1.1',
-          },
           {
             name: 'CLOUD_IP',
             value: '1.1.1.1',
@@ -191,4 +190,24 @@ describe('TuyaHandler.discoverDevices', () => {
 
     assert.callCount(tuyaHandler.connector.request, 3);
   });
+
+  it('should keep local params from existing devices', async () => {
+    gladys.stateManager.get = fake.returns({
+      external_id: 'tuya:uuid',
+      params: [
+        { name: 'IP_ADDRESS', value: '2.2.2.2' },
+        { name: 'PROTOCOL_VERSION', value: '3.3' },
+        { name: 'LOCAL_OVERRIDE', value: true },
+      ],
+      features: [{ external_id: 'tuya:uuid:cur_power' }, { external_id: 'tuya:uuid:switch_1' }],
+    });
+
+    const devices = await tuyaHandler.discoverDevices();
+    const { params } = devices[0];
+    const getParam = (name) => params.find((param) => param.name === name);
+
+    expect(getParam('IP_ADDRESS').value).to.equal('2.2.2.2');
+    expect(getParam('PROTOCOL_VERSION').value).to.equal('3.3');
+    expect(getParam('LOCAL_OVERRIDE').value).to.equal(true);
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index 9fdee7a21b..8b880d9d6f 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -3,6 +3,8 @@ const sinon = require('sinon');
 const { expect } = require('chai');
 const proxyquire = require('proxyquire').noCallThru();
 const { BadParameters } = require('../../../../utils/coreErrors');
+const { DEVICE_PARAM_NAME } = require('../../../../services/tuya/lib/utils/tuya.constants');
+const { updateDiscoveredDeviceAfterLocalPoll } = require('../../../../services/tuya/lib/tuya.localPoll');
 
 const attachEventHandlers = (instance) => {
   instance.on = sinon.stub();
@@ -168,4 +170,152 @@ describe('TuyaHandler.localPoll', () => {
     clock.restore();
     throw new Error('Expected error');
   });
+
+  it('should reject on socket error listener', async () => {
+    const connect = sinon.stub().resolves();
+    const get = sinon.stub().returns(new Promise(() => {}));
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.get = get;
+      this.disconnect = disconnect;
+      this.on = sinon.stub();
+      this.once = sinon.stub().callsFake((event, cb) => {
+        if (event === 'error') {
+          cb(new Error('boom'));
+        }
+      });
+      this.removeListener = sinon.stub();
+    }
+    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+      tuyapi: TuyAPIStub,
+    });
+
+    try {
+      await localPoll({
+        deviceId: 'device',
+        ip: '1.1.1.1',
+        localKey: 'key',
+        protocolVersion: '3.3',
+      });
+    } catch (e) {
+      expect(e).to.be.instanceOf(BadParameters);
+      expect(e.message).to.include('Local poll socket error');
+      return;
+    }
+    throw new Error('Expected error');
+  });
+
+  it('should log last socket error when different from thrown error', async () => {
+    const connect = sinon.stub().rejects(new Error('connect failed'));
+    const get = sinon.stub();
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.get = get;
+      this.disconnect = disconnect;
+      this.once = sinon.stub();
+      this.removeListener = sinon.stub();
+      this.on = sinon.stub().callsFake((event, cb) => {
+        if (event === 'error') {
+          cb(new Error('socket boom'));
+        }
+      });
+    }
+    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+      tuyapi: TuyAPIStub,
+    });
+
+    try {
+      await localPoll({
+        deviceId: 'device',
+        ip: '1.1.1.1',
+        localKey: 'key',
+        protocolVersion: '3.3',
+      });
+    } catch (e) {
+      expect(e.message).to.equal('connect failed');
+      return;
+    }
+    throw new Error('Expected error');
+  });
+});
+
+describe('TuyaHandler.updateDiscoveredDeviceAfterLocalPoll', () => {
+  it('should return null when payload is missing deviceId', () => {
+    const result = updateDiscoveredDeviceAfterLocalPoll({ discoveredDevices: [] }, {});
+    expect(result).to.equal(null);
+  });
+
+  it('should return null when discovered devices is not an array', () => {
+    const result = updateDiscoveredDeviceAfterLocalPoll({ discoveredDevices: null }, { deviceId: 'device' });
+    expect(result).to.equal(null);
+  });
+
+  it('should return null when device is not found', () => {
+    const tuyaManager = { discoveredDevices: [{ external_id: 'tuya:other' }] };
+    const result = updateDiscoveredDeviceAfterLocalPoll(tuyaManager, { deviceId: 'device' });
+    expect(result).to.equal(null);
+  });
+
+  it('should update discovered device with local poll data', () => {
+    const tuyaManager = {
+      discoveredDevices: [
+        {
+          external_id: 'tuya:device1',
+          params: [],
+          product_id: 'pid',
+          product_key: 'pkey',
+        },
+      ],
+    };
+
+    const updated = updateDiscoveredDeviceAfterLocalPoll(tuyaManager, {
+      deviceId: 'device1',
+      ip: '1.1.1.1',
+      protocolVersion: '3.3',
+      localKey: 'key',
+    });
+
+    expect(updated.local_override).to.equal(true);
+    expect(updated.ip).to.equal('1.1.1.1');
+    const { params } = updated;
+    const findParam = (name) => params.find((param) => param.name === name);
+    expect(findParam(DEVICE_PARAM_NAME.IP_ADDRESS).value).to.equal('1.1.1.1');
+    expect(findParam(DEVICE_PARAM_NAME.PROTOCOL_VERSION).value).to.equal('3.3');
+    expect(findParam(DEVICE_PARAM_NAME.LOCAL_KEY).value).to.equal('key');
+    expect(findParam(DEVICE_PARAM_NAME.LOCAL_OVERRIDE).value).to.equal(true);
+    expect(findParam(DEVICE_PARAM_NAME.PRODUCT_ID).value).to.equal('pid');
+    expect(findParam(DEVICE_PARAM_NAME.PRODUCT_KEY).value).to.equal('pkey');
+  });
+
+  it('should merge when gladys stateManager exists', () => {
+    const tuyaManager = {
+      discoveredDevices: [
+        {
+          external_id: 'tuya:device1',
+          params: [],
+          features: [],
+        },
+      ],
+      gladys: {
+        stateManager: {
+          get: sinon.stub().returns({
+            external_id: 'tuya:device1',
+            params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: '1' }],
+            features: [],
+          }),
+        },
+      },
+    };
+
+    const updated = updateDiscoveredDeviceAfterLocalPoll(tuyaManager, {
+      deviceId: 'device1',
+      ip: '1.1.1.1',
+      protocolVersion: '3.3',
+    });
+
+    expect(updated).to.have.property('updatable');
+    expect(updated.local_override).to.equal(true);
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index 0927236f7e..e99593679d 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -193,3 +193,54 @@ describe('TuyaHandler.localScan', () => {
     clock.restore();
   });
 });
+
+describe('TuyaHandler.buildLocalScanResponse', () => {
+  it('should return devices and port errors when discovered devices exist', () => {
+    const { buildLocalScanResponse } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {});
+    const tuyaManager = {
+      discoveredDevices: [{ external_id: 'tuya:device1', params: [] }],
+    };
+    const response = buildLocalScanResponse(tuyaManager, {
+      devices: { device1: { ip: '1.1.1.1', version: '3.3', productKey: 'pkey' } },
+      portErrors: { 6666: 'boom' },
+    });
+
+    expect(response.port_errors).to.deep.equal({ 6666: 'boom' });
+    expect(response.local_devices).to.deep.equal({ device1: { ip: '1.1.1.1', version: '3.3', productKey: 'pkey' } });
+    expect(response.devices).to.be.an('array');
+    expect(response.devices[0].ip).to.equal('1.1.1.1');
+    const ipParam = response.devices[0].params.find((param) => param.name === 'IP_ADDRESS');
+    expect(ipParam.value).to.equal('1.1.1.1');
+  });
+
+  it('should merge devices when gladys stateManager exists', () => {
+    const { buildLocalScanResponse } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {});
+    const tuyaManager = {
+      discoveredDevices: [{ external_id: 'tuya:device1', params: [] }],
+      gladys: {
+        stateManager: {
+          get: sinon.stub().returns({
+            external_id: 'tuya:device1',
+            params: [{ name: 'LOCAL_OVERRIDE', value: true }],
+            features: [],
+          }),
+        },
+      },
+    };
+    const response = buildLocalScanResponse(tuyaManager, {
+      devices: { device1: { ip: '1.1.1.1', version: '3.3' } },
+      portErrors: {},
+    });
+
+    expect(response.devices[0]).to.have.property('updatable');
+    expect(response.devices[0].local_override).to.equal(true);
+  });
+
+  it('should return only local devices when no discovered devices array', () => {
+    const { buildLocalScanResponse } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {});
+    const tuyaManager = { discoveredDevices: null };
+    const response = buildLocalScanResponse(tuyaManager, null);
+
+    expect(response).to.deep.equal({ local_devices: {}, port_errors: {} });
+  });
+});
diff --git a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
new file mode 100644
index 0000000000..b6d9aee4ac
--- /dev/null
+++ b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
@@ -0,0 +1,127 @@
+/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */
+const { expect } = require('chai');
+
+const {
+  applyExistingLocalOverride,
+  applyExistingLocalParams,
+  normalizeExistingDevice,
+  updateDiscoveredDeviceWithLocalInfo,
+  upsertParam,
+} = require('../../../../../services/tuya/lib/utils/tuya.deviceParams');
+const { DEVICE_PARAM_NAME } = require('../../../../../services/tuya/lib/utils/tuya.constants');
+
+describe('Tuya device params utils', () => {
+  it('should upsert params', () => {
+    const params = [{ name: 'test', value: 1 }];
+    upsertParam(params, 'test', 2);
+    expect(params[0].value).to.equal(2);
+    upsertParam(params, 'new', 'value');
+    expect(params.find((param) => param.name === 'new').value).to.equal('value');
+  });
+
+  it('should ignore upsert when value is null or undefined', () => {
+    const params = [{ name: 'test', value: 1 }];
+    upsertParam(params, 'test', null);
+    upsertParam(params, 'other', undefined);
+    expect(params).to.deep.equal([{ name: 'test', value: 1 }]);
+  });
+
+  it('should normalize existing device local override', () => {
+    const device = {
+      params: [
+        { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: '1' },
+        { name: 'OTHER', value: 'x' },
+      ],
+    };
+    const normalized = normalizeExistingDevice(device);
+    const override = normalized.params.find((param) => param.name === DEVICE_PARAM_NAME.LOCAL_OVERRIDE);
+    expect(override.value).to.equal(true);
+    const other = normalized.params.find((param) => param.name === 'OTHER');
+    expect(other.value).to.equal('x');
+  });
+
+  it('should return device when normalizeExistingDevice has no params', () => {
+    const device = { id: 'device' };
+    const normalized = normalizeExistingDevice(device);
+    expect(normalized).to.equal(device);
+  });
+
+  it('should update discovered device with local info', () => {
+    const device = { ip: 'old', params: [] };
+    const localInfo = { ip: '1.1.1.1', version: '3.3', productKey: 'pkey' };
+    const updated = updateDiscoveredDeviceWithLocalInfo(device, localInfo);
+    const ipParam = updated.params.find((param) => param.name === DEVICE_PARAM_NAME.IP_ADDRESS);
+    const protocolParam = updated.params.find((param) => param.name === DEVICE_PARAM_NAME.PROTOCOL_VERSION);
+    const productKeyParam = updated.params.find((param) => param.name === DEVICE_PARAM_NAME.PRODUCT_KEY);
+
+    expect(updated.ip).to.equal('1.1.1.1');
+    expect(updated.protocol_version).to.equal('3.3');
+    expect(updated.product_key).to.equal('pkey');
+    expect(ipParam.value).to.equal('1.1.1.1');
+    expect(protocolParam.value).to.equal('3.3');
+    expect(productKeyParam.value).to.equal('pkey');
+  });
+
+  it('should return device when no local info is provided', () => {
+    const device = { ip: 'old' };
+    const updated = updateDiscoveredDeviceWithLocalInfo(device, null);
+    expect(updated).to.equal(device);
+  });
+
+  it('should return device when updateDiscoveredDeviceWithLocalInfo has no device', () => {
+    const updated = updateDiscoveredDeviceWithLocalInfo(null, { ip: '1.1.1.1' });
+    expect(updated).to.equal(null);
+  });
+
+  it('should apply existing local params', () => {
+    const device = { ip: 'old', protocol_version: '3.1', local_override: false, params: [] };
+    const existingDevice = {
+      params: [
+        { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '2.2.2.2' },
+        { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.3' },
+        { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+      ],
+    };
+    const updated = applyExistingLocalParams(device, existingDevice);
+    expect(updated.ip).to.equal('2.2.2.2');
+    expect(updated.protocol_version).to.equal('3.3');
+    expect(updated.local_override).to.equal(true);
+  });
+
+  it('should keep device values when existing params are missing', () => {
+    const device = { ip: 'old', protocol_version: '3.1', local_override: false, params: [] };
+    const existingDevice = { params: [] };
+    const updated = applyExistingLocalParams(device, existingDevice);
+    expect(updated.ip).to.equal('old');
+    expect(updated.protocol_version).to.equal('3.1');
+    expect(updated.local_override).to.equal(false);
+  });
+
+  it('should return device when applyExistingLocalParams has no existing device', () => {
+    const device = { ip: 'old', protocol_version: '3.1', local_override: false, params: [] };
+    const updated = applyExistingLocalParams(device, null);
+    expect(updated).to.equal(device);
+  });
+
+  it('should apply existing local override when present', () => {
+    const device = { params: [] };
+    const existingDevice = { params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true }] };
+    const updated = applyExistingLocalOverride(device, existingDevice);
+    const overrideParam = updated.params.find((param) => param.name === DEVICE_PARAM_NAME.LOCAL_OVERRIDE);
+    expect(updated.local_override).to.equal(true);
+    expect(overrideParam.value).to.equal(true);
+  });
+
+  it('should return device when no local override is present', () => {
+    const device = { params: [] };
+    const existingDevice = { params: [{ name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '1.1.1.1' }] };
+    const updated = applyExistingLocalOverride(device, existingDevice);
+    expect(updated).to.equal(device);
+  });
+
+  it('should return device when applyExistingLocalOverride has no existing params', () => {
+    const device = { params: [] };
+    const updated = applyExistingLocalOverride(device, null);
+    expect(updated).to.equal(device);
+  });
+});

From b6cb28bd63a4b3739e1aa8c0439f2a10282d65ae Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 21 Feb 2026 01:28:51 +0100
Subject: [PATCH 23/90] =?UTF-8?q?feat(tuya):=20am=C3=A9liorer=20la=20gesti?=
 =?UTF-8?q?on=20des=20informations=20locales=20des=20appareils=20et=20des?=
 =?UTF-8?q?=20tests=20associ=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/config/i18n/en.json                 |  4 +--
 .../all/tuya/discover-page/DiscoverTab.jsx    | 14 +++-------
 .../tuya/lib/utils/tuya.deviceParams.js       | 21 ++++++++++-----
 .../tuya/lib/utils/tuya.deviceParams.test.js  | 27 +++++++++++++++++++
 4 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index be06288212..b582d6b24d 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1165,8 +1165,8 @@
         "accessKeyPlaceholder": "Enter Tuya Client ID",
         "secretKey": "Client Secret",
         "secretKeyPlaceholder": "Enter Tuya Client Secret",
-        "appAccountId": "App account User ID",
-        "appAccountIdPlaceholder": "Enter Tuya app User ID",
+        "appAccountId": "App account UID",
+        "appAccountIdPlaceholder": "Enter Tuya app UID",
         "appUsername": "Smart Life username (optional)",
         "appUsernamePlaceholder": "Smart Life account email or phone",
         "saveLabel": "Save configuration and connect",
diff --git a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
index 47f7dfc729..784b268239 100644
--- a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
+++ b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
@@ -123,8 +123,8 @@ class DiscoverTab extends Component {
     props,
     { loading, errorLoading, discoveredDevices, housesWithRooms, udpScanLoading, udpScanError, udpScanPortErrors }
   ) {
-    const canScanCloud = !errorLoading;
     const isLoading = loading || udpScanLoading;
+    const canScanCloud = !isLoading;
     const localScanTextId = errorLoading
       ? 'integration.tuya.discover.scanLocalInProgressDisconnected'
       : 'integration.tuya.discover.scanLocalInProgressConnected';
@@ -143,18 +143,10 @@ class DiscoverTab extends Component {
             <Text id="integration.tuya.discover.title" />
           </h1>
           <div class="page-options d-flex">
-            <button
-              onClick={this.getDiscoveredDevices}
-              class="btn btn-outline-primary ml-2"
-              disabled={loading || !canScanCloud}
-            >
+            <button onClick={this.getDiscoveredDevices} class="btn btn-outline-primary ml-2" disabled={!canScanCloud}>
               <Text id="integration.tuya.discover.scanCloud" /> <i class="fe fe-radio" />
             </button>
-            <button
-              onClick={this.runLocalScan}
-              class="btn btn-outline-success ml-2"
-              disabled={loading || udpScanLoading}
-            >
+            <button onClick={this.runLocalScan} class="btn btn-outline-success ml-2" disabled={isLoading}>
               <Text id="integration.tuya.discover.localScanAuto" />
             </button>
           </div>
diff --git a/server/services/tuya/lib/utils/tuya.deviceParams.js b/server/services/tuya/lib/utils/tuya.deviceParams.js
index 6cd7f5fd89..3f7c4dcbcc 100644
--- a/server/services/tuya/lib/utils/tuya.deviceParams.js
+++ b/server/services/tuya/lib/utils/tuya.deviceParams.js
@@ -28,9 +28,13 @@ const updateDiscoveredDeviceWithLocalInfo = (device, localInfo) => {
     return device;
   }
   const updated = { ...device };
-  updated.protocol_version = localInfo.version;
+  if (localInfo.version !== undefined && localInfo.version !== null) {
+    updated.protocol_version = localInfo.version;
+  }
   updated.ip = localInfo.ip || updated.ip;
-  updated.product_key = localInfo.productKey;
+  if (localInfo.productKey !== undefined && localInfo.productKey !== null) {
+    updated.product_key = localInfo.productKey;
+  }
   updated.params = Array.isArray(updated.params) ? [...updated.params] : [];
   upsertParam(updated.params, DEVICE_PARAM_NAME.IP_ADDRESS, updated.ip);
   upsertParam(updated.params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, updated.protocol_version);
@@ -53,7 +57,11 @@ const applyExistingLocalParams = (device, existingDevice) => {
   const params = Array.isArray(device.params) ? [...device.params] : [];
   const ipValue = getExistingParamValue(existingDevice, DEVICE_PARAM_NAME.IP_ADDRESS);
   const protocolValue = getExistingParamValue(existingDevice, DEVICE_PARAM_NAME.PROTOCOL_VERSION);
-  const localOverrideValue = getExistingParamValue(existingDevice, DEVICE_PARAM_NAME.LOCAL_OVERRIDE);
+  const rawLocalOverrideValue = getExistingParamValue(existingDevice, DEVICE_PARAM_NAME.LOCAL_OVERRIDE);
+  const localOverrideValue =
+    rawLocalOverrideValue !== undefined && rawLocalOverrideValue !== null
+      ? normalizeBoolean(rawLocalOverrideValue)
+      : rawLocalOverrideValue;
 
   upsertParam(params, DEVICE_PARAM_NAME.IP_ADDRESS, ipValue);
   upsertParam(params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, protocolValue);
@@ -74,13 +82,14 @@ const applyExistingLocalOverride = (device, existingDevice) => {
     return device;
   }
   const overrideParam = existingDevice.params.find((param) => param.name === DEVICE_PARAM_NAME.LOCAL_OVERRIDE);
-  if (!overrideParam) {
+  if (!overrideParam || overrideParam.value === undefined || overrideParam.value === null) {
     return device;
   }
   const updated = { ...device };
   updated.params = Array.isArray(updated.params) ? [...updated.params] : [];
-  upsertParam(updated.params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE, overrideParam.value);
-  updated.local_override = overrideParam.value;
+  const normalizedOverride = normalizeBoolean(overrideParam.value);
+  upsertParam(updated.params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE, normalizedOverride);
+  updated.local_override = normalizedOverride;
   return updated;
 };
 
diff --git a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
index b6d9aee4ac..a9522ebcd4 100644
--- a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
+++ b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
@@ -62,6 +62,15 @@ describe('Tuya device params utils', () => {
     expect(productKeyParam.value).to.equal('pkey');
   });
 
+  it('should keep protocol and product key when local info is partial', () => {
+    const device = { ip: 'old', protocol_version: '3.3', product_key: 'pkey', params: [] };
+    const localInfo = { ip: '2.2.2.2' };
+    const updated = updateDiscoveredDeviceWithLocalInfo(device, localInfo);
+    expect(updated.ip).to.equal('2.2.2.2');
+    expect(updated.protocol_version).to.equal('3.3');
+    expect(updated.product_key).to.equal('pkey');
+  });
+
   it('should return device when no local info is provided', () => {
     const device = { ip: 'old' };
     const updated = updateDiscoveredDeviceWithLocalInfo(device, null);
@@ -88,6 +97,15 @@ describe('Tuya device params utils', () => {
     expect(updated.local_override).to.equal(true);
   });
 
+  it('should normalize local override when applying existing params', () => {
+    const device = { ip: 'old', protocol_version: '3.1', local_override: true, params: [] };
+    const existingDevice = {
+      params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: 'false' }],
+    };
+    const updated = applyExistingLocalParams(device, existingDevice);
+    expect(updated.local_override).to.equal(false);
+  });
+
   it('should keep device values when existing params are missing', () => {
     const device = { ip: 'old', protocol_version: '3.1', local_override: false, params: [] };
     const existingDevice = { params: [] };
@@ -112,6 +130,15 @@ describe('Tuya device params utils', () => {
     expect(overrideParam.value).to.equal(true);
   });
 
+  it('should normalize existing local override when applying override', () => {
+    const device = { params: [] };
+    const existingDevice = { params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: 'false' }] };
+    const updated = applyExistingLocalOverride(device, existingDevice);
+    const overrideParam = updated.params.find((param) => param.name === DEVICE_PARAM_NAME.LOCAL_OVERRIDE);
+    expect(updated.local_override).to.equal(false);
+    expect(overrideParam.value).to.equal(false);
+  });
+
   it('should return device when no local override is present', () => {
     const device = { params: [] };
     const existingDevice = { params: [{ name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '1.1.1.1' }] };

From 52a54b24ba36781be17c21c0f1a9d12e3145e099 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 21 Feb 2026 02:00:37 +0100
Subject: [PATCH 24/90] =?UTF-8?q?feat(tuya):=20traduire=20les=20cl=C3=A9s?=
 =?UTF-8?q?=20de=20produit=20et=20am=C3=A9liorer=20les=20messages=20de=20d?=
 =?UTF-8?q?=C3=A9bogage=20pour=20la=20gestion=20des=20appareils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/config/i18n/de.json                 |  2 +-
 front/src/config/i18n/fr.json                 |  4 +-
 .../integration/all/tuya/TuyaDeviceBox.jsx    |  8 ++--
 .../all/tuya/discover-page/DiscoverTab.jsx    | 14 +++---
 .../tuya/lib/device/tuya.convertDevice.js     | 11 ++++-
 .../tuya/lib/tuya.loadDeviceDetails.js        |  5 +--
 server/services/tuya/lib/tuya.localScan.js    | 43 ++++++-------------
 server/services/tuya/lib/tuya.setValue.js     | 23 +++++++---
 .../lib/controllers/tuya.controller.test.js   |  5 +++
 9 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index c2be8ba918..b6574fd114 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1225,7 +1225,7 @@
         "protocol35Unsupported": "Protokoll 3.5 wird lokal noch nicht unterstützt.",
         "githubIssueInfo": "Ein Bericht wird mit den Gerätedetails gesendet. Sensible Daten (Local Key und IP) werden maskiert.",
         "productIdLabel": "Produkt-ID",
-        "productKeyLabel": "Product Key"
+        "productKeyLabel": "Produktschlüssel"
       },
       "discover": {
         "title": "In deinem Tuya-Cloud-Account erkannte Geräte",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index bd612ba74f..b51ecca518 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1355,7 +1355,7 @@
         "protocol35Unsupported": "Le protocole 3.5 n'est pas pris en charge en local pour le moment.",
         "githubIssueInfo": "Un rapport sera envoyé avec les informations du périphérique. Les données sensibles (clé locale et IP) sont masquées.",
         "productIdLabel": "Identifiant produit",
-        "productKeyLabel": "Product Key"
+        "productKeyLabel": "Clé produit"
       },
       "discover": {
         "title": "Appareils détectés sur votre compte cloud Tuya",
@@ -1408,7 +1408,7 @@
         "error": "Une erreur s'est produite lors de la sauvegarde de la configuration.",
         "connecting": "Configuration sauvegardée. Connexion à votre compte cloud Tuya...",
         "connectionError": "Erreur lors de la connexion, veuillez vérifier votre configuration.",
-        "notConfigured": "Information de connexion au compte cloud Tuya non renseignées ou manquante !",
+        "notConfigured": "Informations de connexion au compte cloud Tuya non renseignées ou manquantes !",
         "connected": "Connexion au compte cloud Tuya réussie !",
         "connectedAfterSave": "Connexion au compte cloud Tuya réussie !",
         "connectedStatus": "Connecté au compte cloud Tuya.",
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 9399427ea0..0182d2f097 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -242,6 +242,7 @@ class TuyaDeviceBox extends Component {
     try {
       let result = null;
       let usedProtocol = selectedProtocol;
+      let latestDevice = null;
       const isValidResult = data => data && typeof data === 'object' && data.dps;
       for (let i = 0; i < protocolList.length; i += 1) {
         const protocolVersion = protocolList[i];
@@ -260,9 +261,7 @@ class TuyaDeviceBox extends Component {
           result = response && response.dps ? response : null;
           const updatedDevice = response && response.device ? response.device : null;
           if (updatedDevice) {
-            this.setState({
-              device: updatedDevice
-            });
+            latestDevice = updatedDevice;
           }
           if (!isValidResult(result)) {
             throw new Error('Invalid local poll response');
@@ -284,9 +283,10 @@ class TuyaDeviceBox extends Component {
           newParams.push({ name: 'PROTOCOL_VERSION', value: usedProtocol });
         }
       }
+      const baseDevice = latestDevice || this.state.device;
       this.setState({
         device: {
-          ...this.state.device,
+          ...baseDevice,
           params: newParams
         },
         localPollStatus: RequestStatus.Success,
diff --git a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
index 784b268239..f19443f40e 100644
--- a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
+++ b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
@@ -172,13 +172,14 @@ class DiscoverTab extends Component {
           {portErrorPorts.length > 0 && (
             <div class="alert alert-warning">
               <Localizer>
-                {localizer => (
-                  <span>
-                    {localizer.t('integration.tuya.discover.udpScanPortInUse', {
+                <span>
+                  <Text
+                    id="integration.tuya.discover.udpScanPortInUse"
+                    fields={{
                       ports: portErrorPorts.join(', ')
-                    })}
-                  </span>
-                )}
+                    }}
+                  />
+                </span>
               </Localizer>
             </div>
           )}
@@ -199,6 +200,7 @@ class DiscoverTab extends Component {
               <div class="row">
                 {orderedDevices.map((device, index) => (
                   <TuyaDeviceBox
+                    key={device.external_id || device.id || index}
                     editable={!device.created_at || device.updatable}
                     alreadyCreatedButton={device.created_at && !device.updatable}
                     updateButton={device.updatable}
diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index 299dc62267..ef71d9d7d7 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -54,8 +54,17 @@ function convertDevice(tuyaDevice) {
   if (productKey) {
     params.push({ name: DEVICE_PARAM_NAME.PRODUCT_KEY, value: productKey });
   }
+  const safeDeviceLog = {
+    id,
+    name,
+    model: productName || model,
+    product_id: productId,
+    protocol_version: protocolVersion,
+    local_override: localOverride,
+    online,
+  };
   logger.debug(`Tuya convert device specifications"`);
-  logger.debug(JSON.stringify(tuyaDevice));
+  logger.debug(JSON.stringify(safeDeviceLog));
 
   logger.debug(`Tuya convert device"${name}, ${productName || model}"`);
   // Groups functions and status on same code
diff --git a/server/services/tuya/lib/tuya.loadDeviceDetails.js b/server/services/tuya/lib/tuya.loadDeviceDetails.js
index 6d6212f01e..23228fb394 100644
--- a/server/services/tuya/lib/tuya.loadDeviceDetails.js
+++ b/server/services/tuya/lib/tuya.loadDeviceDetails.js
@@ -26,9 +26,8 @@ async function loadDeviceDetails(tuyaDevice) {
   const specifications = specificationsResponse.result || {};
   const details = detailsResponse.result || {};
 
-  // Temporary verbose logging to inspect what Tuya cloud returns
-  logger.debug(`[Tuya] Device details raw for ${deviceId}: ${JSON.stringify(details)}`);
-  logger.debug(`[Tuya] Device specifications raw for ${deviceId}: ${JSON.stringify(specifications)}`);
+  logger.debug(`[Tuya] Device details loaded for ${deviceId}`);
+  logger.debug(`[Tuya] Device specifications loaded for ${deviceId}`);
 
   return { ...tuyaDevice, ...details, specifications };
 }
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index a790562e61..d79fd511cd 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -10,28 +10,6 @@ const {
 } = require('./utils/tuya.deviceParams');
 
 const DEFAULT_PORTS = [6666, 6667, 7000];
-const formatHex = (buffer, maxLen = 128) => {
-  if (!buffer || !buffer.length) {
-    return '';
-  }
-  const slice = buffer.slice(0, maxLen);
-  return slice
-    .toString('hex')
-    .match(/.{1,2}/g)
-    .join(' ');
-};
-
-const formatAscii = (buffer, maxLen = 256) => {
-  if (!buffer || !buffer.length) {
-    return '';
-  }
-  const slice = buffer.slice(0, maxLen);
-  return slice
-    .toString('utf8')
-    .replace(/\s+/g, ' ')
-    .trim();
-};
-
 /**
  * @description Scan local network for Tuya devices (UDP broadcast).
  * @param {number|object} input - Scan duration in seconds or options.
@@ -54,14 +32,20 @@ async function localScan(input = 10) {
     const byteLen = message ? message.length : 0;
     const remote = rinfo ? `${rinfo.address}:${rinfo.port}` : 'unknown';
     const source = rinfo && rinfo.source ? rinfo.source : 'udp';
-    logger.info(
-      `[Tuya][localScan] Packet received (${source}) from ${remote} len=${byteLen} hex=${formatHex(
-        message,
-      )} ascii="${formatAscii(message)}"`,
-    );
+    logger.debug(`[Tuya][localScan] Packet received (${source}) from ${remote} len=${byteLen}`);
     try {
       const parsed = parser.parse(message);
-      logger.info(`[Tuya][localScan] Parsed packet from ${remote}: ${JSON.stringify(parsed)}`);
+      const safePayload =
+        parsed && parsed[0] && parsed[0].payload
+          ? {
+              gwId: parsed[0].payload.gwId,
+              devId: parsed[0].payload.devId,
+              id: parsed[0].payload.id,
+              version: parsed[0].payload.version,
+              hasIp: !!parsed[0].payload.ip,
+            }
+          : null;
+      logger.debug(`[Tuya][localScan] Parsed packet from ${remote}: ${JSON.stringify(safePayload)}`);
       payload = parsed && parsed[0] && parsed[0].payload;
     } catch (e) {
       logger.info(`[Tuya][localScan] Unable to parse payload from ${remote} (len=${byteLen}): ${e.message}`);
@@ -74,6 +58,7 @@ async function localScan(input = 10) {
     }
 
     const { gwId, devId, id, ip, version, productKey } = payload;
+    const resolvedIp = ip || (rinfo && rinfo.address);
     const deviceId = gwId || devId || id;
 
     if (!deviceId) {
@@ -83,7 +68,7 @@ async function localScan(input = 10) {
 
     const isNew = !devices[deviceId];
     devices[deviceId] = {
-      ip,
+      ip: resolvedIp,
       version,
       productKey,
     };
diff --git a/server/services/tuya/lib/tuya.setValue.js b/server/services/tuya/lib/tuya.setValue.js
index cb1b658e45..ad7642e2f3 100644
--- a/server/services/tuya/lib/tuya.setValue.js
+++ b/server/services/tuya/lib/tuya.setValue.js
@@ -60,20 +60,29 @@ async function setValue(device, deviceFeature, value) {
   const localDps = getLocalDpsFromCode(command);
 
   if (hasLocalConfig && localDps !== null) {
+    const tuyaLocal = new TuyAPI({
+      id: topic,
+      key: localKey,
+      ip: ipAddress,
+      version: protocolVersion,
+    });
+    let connected = false;
     try {
-      const tuyaLocal = new TuyAPI({
-        id: topic,
-        key: localKey,
-        ip: ipAddress,
-        version: protocolVersion,
-      });
       await tuyaLocal.connect();
+      connected = true;
       await tuyaLocal.set({ dps: localDps, set: transformedValue });
-      await tuyaLocal.disconnect();
       logger.debug(`[Tuya][setValue][local] device=${topic} dps=${localDps} value=${transformedValue}`);
       return;
     } catch (e) {
       logger.warn(`[Tuya][setValue][local] failed, fallback to cloud`, e);
+    } finally {
+      if (connected) {
+        try {
+          await tuyaLocal.disconnect();
+        } catch (disconnectError) {
+          logger.warn('[Tuya][setValue][local] disconnect failed', disconnectError);
+        }
+      }
     }
   }
 
diff --git a/server/test/services/tuya/lib/controllers/tuya.controller.test.js b/server/test/services/tuya/lib/controllers/tuya.controller.test.js
index 9d8d3921b8..0c8f38c8aa 100644
--- a/server/test/services/tuya/lib/controllers/tuya.controller.test.js
+++ b/server/test/services/tuya/lib/controllers/tuya.controller.test.js
@@ -15,6 +15,7 @@ const tuyaManager = {
     },
   ],
 };
+const defaultLocalScan = tuyaManager.localScan;
 
 describe('TuyaController GET /api/v1/service/tuya/discover', () => {
   let controller;
@@ -113,6 +114,10 @@ describe('TuyaController POST /api/v1/service/tuya/local-scan', () => {
     tuyaManager.discoveredDevices = [{ external_id: 'tuya:device1', params: [] }];
   });
 
+  afterEach(() => {
+    tuyaManager.localScan = defaultLocalScan;
+  });
+
   it('should run local scan and return devices', async () => {
     const req = { body: { timeoutSeconds: 1 } };
     const res = {

From ae8a1d6bc191888bc903e51207e9035264a647bd Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 21 Feb 2026 02:36:16 +0100
Subject: [PATCH 25/90] =?UTF-8?q?feat(tuya):=20am=C3=A9liorer=20la=20gesti?=
 =?UTF-8?q?on=20des=20erreurs=20et=20des=20messages=20de=20d=C3=A9bogage,?=
 =?UTF-8?q?=20ajouter=20des=20tests=20pour=20la=20reconnexion=20automatiqu?=
 =?UTF-8?q?e=20et=20la=20d=C3=A9couverte=20des=20appareils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/config/i18n/de.json                 |  2 +-
 .../tuya/lib/device/tuya.convertDevice.js     |  4 +-
 .../tuya/lib/tuya.loadDeviceDetails.js        | 16 +++-
 .../tuya/lib/utils/tuya.deviceParams.js       | 12 ++-
 server/test/services/tuya/index.test.js       | 75 ++++++++++++++++++-
 .../lib/controllers/tuya.controller.test.js   | 38 ++++++++++
 .../tuya/lib/tuya.discoverDevices.test.js     | 21 ++++++
 .../services/tuya/lib/tuya.localPoll.test.js  | 30 ++++++++
 .../services/tuya/lib/tuya.localScan.test.js  | 45 +++++++++++
 .../services/tuya/lib/tuya.setValue.test.js   | 65 ++++++++++++++++
 .../tuya/lib/utils/tuya.deviceParams.test.js  | 18 +++++
 11 files changed, 315 insertions(+), 11 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index b6574fd114..49d438de78 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1223,7 +1223,7 @@
         "localPollSuccess": "Lokaler Poll OK.",
         "localPollError": "Lokaler Poll fehlgeschlagen:",
         "protocol35Unsupported": "Protokoll 3.5 wird lokal noch nicht unterstützt.",
-        "githubIssueInfo": "Ein Bericht wird mit den Gerätedetails gesendet. Sensible Daten (Local Key und IP) werden maskiert.",
+        "githubIssueInfo": "Ein Bericht wird mit den Gerätedetails gesendet. Sensible Daten (Lokaler Schlüssel und IP-Adresse) werden maskiert.",
         "productIdLabel": "Produkt-ID",
         "productKeyLabel": "Produktschlüssel"
       },
diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index ef71d9d7d7..b5d85d6294 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -63,10 +63,10 @@ function convertDevice(tuyaDevice) {
     local_override: localOverride,
     online,
   };
-  logger.debug(`Tuya convert device specifications"`);
+  logger.debug('Tuya convert device specifications');
   logger.debug(JSON.stringify(safeDeviceLog));
 
-  logger.debug(`Tuya convert device"${name}, ${productName || model}"`);
+  logger.debug(`Tuya convert device "${name}, ${productName || model}"`);
   // Groups functions and status on same code
   const groups = {};
   status.forEach((stat) => {
diff --git a/server/services/tuya/lib/tuya.loadDeviceDetails.js b/server/services/tuya/lib/tuya.loadDeviceDetails.js
index 23228fb394..e095493685 100644
--- a/server/services/tuya/lib/tuya.loadDeviceDetails.js
+++ b/server/services/tuya/lib/tuya.loadDeviceDetails.js
@@ -12,7 +12,7 @@ async function loadDeviceDetails(tuyaDevice) {
   const { id: deviceId } = tuyaDevice;
   logger.debug(`Loading ${deviceId} Tuya device specifications`);
 
-  const [specificationsResponse, detailsResponse] = await Promise.all([
+  const [specResult, detailsResult] = await Promise.allSettled([
     this.connector.request({
       method: 'GET',
       path: `${API.VERSION_1_0}/devices/${deviceId}/specification`,
@@ -23,8 +23,18 @@ async function loadDeviceDetails(tuyaDevice) {
     }),
   ]);
 
-  const specifications = specificationsResponse.result || {};
-  const details = detailsResponse.result || {};
+  if (specResult.status === 'rejected') {
+    const reason = specResult.reason && specResult.reason.message ? specResult.reason.message : specResult.reason;
+    logger.warn(`[Tuya] Failed to load specifications for ${deviceId}: ${reason}`);
+  }
+  if (detailsResult.status === 'rejected') {
+    const reason =
+      detailsResult.reason && detailsResult.reason.message ? detailsResult.reason.message : detailsResult.reason;
+    logger.warn(`[Tuya] Failed to load details for ${deviceId}: ${reason}`);
+  }
+
+  const specifications = specResult.status === 'fulfilled' ? specResult.value.result || {} : {};
+  const details = detailsResult.status === 'fulfilled' ? detailsResult.value.result || {} : {};
 
   logger.debug(`[Tuya] Device details loaded for ${deviceId}`);
   logger.debug(`[Tuya] Device specifications loaded for ${deviceId}`);
diff --git a/server/services/tuya/lib/utils/tuya.deviceParams.js b/server/services/tuya/lib/utils/tuya.deviceParams.js
index 3f7c4dcbcc..dcf3a27aff 100644
--- a/server/services/tuya/lib/utils/tuya.deviceParams.js
+++ b/server/services/tuya/lib/utils/tuya.deviceParams.js
@@ -17,9 +17,15 @@ const normalizeExistingDevice = (device) => {
   if (!device || !Array.isArray(device.params)) {
     return device;
   }
-  const normalizedParams = device.params.map((param) =>
-    param.name === DEVICE_PARAM_NAME.LOCAL_OVERRIDE ? { ...param, value: normalizeBoolean(param.value) } : param,
-  );
+  const normalizedParams = device.params.map((param) => {
+    if (param.name !== DEVICE_PARAM_NAME.LOCAL_OVERRIDE) {
+      return param;
+    }
+    if (param.value === undefined || param.value === null) {
+      return param;
+    }
+    return { ...param, value: normalizeBoolean(param.value) };
+  });
   return { ...device, params: normalizedParams };
 };
 
diff --git a/server/test/services/tuya/index.test.js b/server/test/services/tuya/index.test.js
index 3a30d94d10..acf0e6e8de 100644
--- a/server/test/services/tuya/index.test.js
+++ b/server/test/services/tuya/index.test.js
@@ -19,13 +19,24 @@ const serviceId = 'ffa13430-df93-488a-9733-5c540e9558e0';
 
 describe('TuyaService', () => {
   let tuyaService;
+  let intervalCallback;
+  let setIntervalStub;
+  let clearIntervalStub;
 
   beforeEach(() => {
     sinon.resetHistory();
+    intervalCallback = null;
+    setIntervalStub = sinon.stub(global, 'setInterval').callsFake((cb) => {
+      intervalCallback = cb;
+      return 123;
+    });
+    clearIntervalStub = sinon.stub(global, 'clearInterval');
     tuyaService = TuyaService(gladys, serviceId);
   });
 
   afterEach(() => {
+    setIntervalStub.restore();
+    clearIntervalStub.restore();
     sinon.resetHistory();
   });
 
@@ -37,9 +48,10 @@ describe('TuyaService', () => {
   });
 
   it('should stop service', async () => {
-    tuyaService.stop();
-    assert.notCalled(tuyaService.device.init);
+    await tuyaService.start();
+    await tuyaService.stop();
     assert.calledOnce(tuyaService.device.disconnect);
+    assert.calledOnce(clearIntervalStub);
   });
 
   it('isUsed: should return false, service not used', async () => {
@@ -53,4 +65,63 @@ describe('TuyaService', () => {
     const used = await tuyaService.isUsed();
     expect(used).to.equal(true);
   });
+
+  it('should attempt auto-reconnect when disconnected', async () => {
+    tuyaService.device.getStatus = fake.resolves({ configured: true, manual_disconnect: false });
+    tuyaService.device.getConfiguration = fake.resolves({ config: 'ok' });
+    tuyaService.device.connect = fake.resolves();
+
+    await tuyaService.start();
+    tuyaService.device.status = STATUS.DISCONNECTED;
+
+    await intervalCallback();
+
+    assert.calledOnce(tuyaService.device.getStatus);
+    assert.calledOnce(tuyaService.device.getConfiguration);
+    assert.calledOnce(tuyaService.device.connect);
+  });
+
+  it('should not auto-reconnect when not configured or manually disconnected', async () => {
+    tuyaService.device.getStatus = fake.resolves({ configured: false, manual_disconnect: true });
+    tuyaService.device.getConfiguration = fake.resolves({ config: 'ok' });
+    tuyaService.device.connect = fake.resolves();
+
+    await tuyaService.start();
+    tuyaService.device.status = STATUS.DISCONNECTED;
+
+    await intervalCallback();
+
+    assert.calledOnce(tuyaService.device.getStatus);
+    assert.notCalled(tuyaService.device.getConfiguration);
+    assert.notCalled(tuyaService.device.connect);
+  });
+
+  it('should not auto-reconnect when already connecting', async () => {
+    tuyaService.device.getStatus = fake.resolves({ configured: true, manual_disconnect: false });
+    tuyaService.device.getConfiguration = fake.resolves({ config: 'ok' });
+    tuyaService.device.connect = fake.resolves();
+
+    await tuyaService.start();
+    tuyaService.device.status = STATUS.CONNECTING;
+
+    await intervalCallback();
+
+    assert.calledOnce(tuyaService.device.getStatus);
+    assert.notCalled(tuyaService.device.getConfiguration);
+    assert.notCalled(tuyaService.device.connect);
+  });
+
+  it('should handle auto-reconnect errors', async () => {
+    tuyaService.device.getStatus = fake.rejects(new Error('status failure'));
+    tuyaService.device.getConfiguration = fake.resolves({ config: 'ok' });
+    tuyaService.device.connect = fake.resolves();
+
+    await tuyaService.start();
+
+    await intervalCallback();
+
+    assert.calledOnce(tuyaService.device.getStatus);
+    assert.notCalled(tuyaService.device.getConfiguration);
+    assert.notCalled(tuyaService.device.connect);
+  });
 });
diff --git a/server/test/services/tuya/lib/controllers/tuya.controller.test.js b/server/test/services/tuya/lib/controllers/tuya.controller.test.js
index 0c8f38c8aa..526090bd2b 100644
--- a/server/test/services/tuya/lib/controllers/tuya.controller.test.js
+++ b/server/test/services/tuya/lib/controllers/tuya.controller.test.js
@@ -8,6 +8,8 @@ const tuyaManager = {
   discoverDevices: fake.resolves([]),
   localPoll: fake.resolves({ dps: { 1: true } }),
   localScan: fake.resolves({ devices: { device1: { ip: '1.1.1.1', version: '3.3' } }, portErrors: {} }),
+  getStatus: fake.resolves({ status: 'connected' }),
+  manualDisconnect: fake.resolves(),
   discoveredDevices: [
     {
       external_id: 'tuya:device1',
@@ -161,3 +163,39 @@ describe('TuyaController POST /api/v1/service/tuya/local-scan', () => {
     });
   });
 });
+
+describe('TuyaController GET /api/v1/service/tuya/status', () => {
+  let controller;
+
+  beforeEach(() => {
+    controller = TuyaController(tuyaManager);
+    sinon.resetHistory();
+  });
+
+  it('should return status', async () => {
+    const req = {};
+    const res = { json: fake.returns([]) };
+
+    await controller['get /api/v1/service/tuya/status'].controller(req, res);
+    assert.calledOnce(tuyaManager.getStatus);
+    assert.calledWith(res.json, { status: 'connected' });
+  });
+});
+
+describe('TuyaController POST /api/v1/service/tuya/disconnect', () => {
+  let controller;
+
+  beforeEach(() => {
+    controller = TuyaController(tuyaManager);
+    sinon.resetHistory();
+  });
+
+  it('should disconnect', async () => {
+    const req = {};
+    const res = { json: fake.returns([]) };
+
+    await controller['post /api/v1/service/tuya/disconnect'].controller(req, res);
+    assert.calledOnce(tuyaManager.manualDisconnect);
+    assert.calledWith(res.json, { success: true });
+  });
+});
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index 3955478808..21a2fdfdf5 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -210,4 +210,25 @@ describe('TuyaHandler.discoverDevices', () => {
     expect(getParam('PROTOCOL_VERSION').value).to.equal('3.3');
     expect(getParam('LOCAL_OVERRIDE').value).to.equal(true);
   });
+
+  it('should append existing devices not returned by discovery', async () => {
+    gladys.device.get = fake.resolves([
+      { external_id: 'tuya:existing', name: 'Existing device', params: [] },
+      { name: 'missing external id' },
+    ]);
+
+    const devices = await tuyaHandler.discoverDevices();
+    const existing = devices.find((device) => device.external_id === 'tuya:existing');
+
+    expect(existing).to.not.equal(undefined);
+    expect(existing.updatable).to.equal(false);
+  });
+
+  it('should continue when loading existing devices fails', async () => {
+    gladys.device.get = fake.rejects(new Error('failure'));
+
+    const devices = await tuyaHandler.discoverDevices();
+    expect(devices).to.be.an('array');
+    expect(devices.length).to.be.greaterThan(0);
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index 8b880d9d6f..5d0bc9de7a 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -239,6 +239,36 @@ describe('TuyaHandler.localPoll', () => {
     }
     throw new Error('Expected error');
   });
+
+  it('should stop cleanup when already resolved', async () => {
+    const connect = sinon.stub().resolves();
+    const get = sinon.stub().resolves({ dps: { 1: true } });
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.get = get;
+      this.disconnect = disconnect;
+      this.on = sinon.stub();
+      this.once = sinon.stub();
+      this.removeListener = sinon.stub().throws(new Error('removeListener error'));
+    }
+    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+      tuyapi: TuyAPIStub,
+    });
+
+    try {
+      await localPoll({
+        deviceId: 'device',
+        ip: '1.1.1.1',
+        localKey: 'key',
+        protocolVersion: '3.3',
+      });
+    } catch (e) {
+      expect(e.message).to.equal('removeListener error');
+      return;
+    }
+    throw new Error('Expected error');
+  });
 });
 
 describe('TuyaHandler.updateDiscoveredDeviceAfterLocalPoll', () => {
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index e99593679d..30e2de095f 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -155,6 +155,9 @@ describe('TuyaHandler.localScan', () => {
             handlers[event] = cb;
           },
           bind: (options, cb) => {
+            if (handlers.listening) {
+              handlers.listening();
+            }
             if (typeof options === 'function') {
               options();
               return;
@@ -192,6 +195,48 @@ describe('TuyaHandler.localScan', () => {
     await promise;
     clock.restore();
   });
+
+  it('should log listening address when available', async () => {
+    const sockets = [];
+    const dgramStub = {
+      createSocket: () => {
+        const handlers = {};
+        const socket = {
+          on: (event, cb) => {
+            handlers[event] = cb;
+          },
+          bind: () => {
+            if (handlers.listening) {
+              handlers.listening();
+            }
+          },
+          close: () => {},
+          address: () => ({ address: '0.0.0.0', port: 6666 }),
+          handlers,
+        };
+        sockets.push(socket);
+        return socket;
+      },
+    };
+
+    class MessageParserStub {
+      parse() {
+        return [{ payload: null }];
+      }
+    }
+
+    const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
+      dgram: dgramStub,
+      'tuyapi/lib/message-parser': { MessageParser: MessageParserStub },
+      'tuyapi/lib/config': { UDP_KEY: 'key' },
+    });
+
+    const clock = sinon.useFakeTimers();
+    const promise = localScan(1);
+    await clock.tickAsync(1100);
+    await promise;
+    clock.restore();
+  });
 });
 
 describe('TuyaHandler.buildLocalScanResponse', () => {
diff --git a/server/test/services/tuya/lib/tuya.setValue.test.js b/server/test/services/tuya/lib/tuya.setValue.test.js
index e2422a2d45..0a302d5283 100644
--- a/server/test/services/tuya/lib/tuya.setValue.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.test.js
@@ -290,4 +290,69 @@ describe('TuyaHandler.setValue', () => {
 
     expect(ctx.connector.request.calledOnce).to.equal(true);
   });
+
+  it('should fallback to cloud when command is empty', async () => {
+    const device = {
+      params: [
+        { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '10.0.0.2' },
+        { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+        { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.3' },
+        { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+      ],
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:',
+      category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+      type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub().resolves({}) },
+      gladys: {},
+    };
+
+    await tuyaHandler.setValue.call(ctx, device, deviceFeature, 1);
+
+    expect(ctx.connector.request.calledOnce).to.equal(true);
+  });
+
+  it('should log disconnect failures and still return on local success', async () => {
+    const connect = sinon.stub().resolves();
+    const set = sinon.stub().resolves();
+    const disconnect = sinon.stub().rejects(new Error('disconnect error'));
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.set = set;
+      this.disconnect = disconnect;
+    }
+    const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
+      tuyapi: TuyAPIStub,
+    });
+
+    const device = {
+      params: [
+        { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '10.0.0.2' },
+        { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+        { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.3' },
+        { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+      ],
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:switch_1',
+      category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+      type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub() },
+      gladys: {},
+    };
+
+    await setValue.call(ctx, device, deviceFeature, 1);
+
+    expect(connect.calledOnce).to.equal(true);
+    expect(set.calledOnce).to.equal(true);
+    expect(disconnect.calledOnce).to.equal(true);
+    expect(ctx.connector.request.called).to.equal(false);
+  });
 });
diff --git a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
index a9522ebcd4..8d6f66a2a4 100644
--- a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
+++ b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
@@ -40,6 +40,15 @@ describe('Tuya device params utils', () => {
     expect(other.value).to.equal('x');
   });
 
+  it('should not normalize local override when value is null', () => {
+    const device = {
+      params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: null }],
+    };
+    const normalized = normalizeExistingDevice(device);
+    const override = normalized.params.find((param) => param.name === DEVICE_PARAM_NAME.LOCAL_OVERRIDE);
+    expect(override.value).to.equal(null);
+  });
+
   it('should return device when normalizeExistingDevice has no params', () => {
     const device = { id: 'device' };
     const normalized = normalizeExistingDevice(device);
@@ -97,6 +106,15 @@ describe('Tuya device params utils', () => {
     expect(updated.local_override).to.equal(true);
   });
 
+  it('should keep device values when existing params are not an array', () => {
+    const device = { ip: 'old', protocol_version: '3.1', local_override: false, params: [] };
+    const existingDevice = { params: null };
+    const updated = applyExistingLocalParams(device, existingDevice);
+    expect(updated.ip).to.equal('old');
+    expect(updated.protocol_version).to.equal('3.1');
+    expect(updated.local_override).to.equal(false);
+  });
+
   it('should normalize local override when applying existing params', () => {
     const device = { ip: 'old', protocol_version: '3.1', local_override: true, params: [] };
     const existingDevice = {

From c68075db3ec14c664d2663deb4acf87f0d94aca4 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 21 Feb 2026 03:18:54 +0100
Subject: [PATCH 26/90] =?UTF-8?q?feat(tuya):=20nettoyer=20les=20messages?=
 =?UTF-8?q?=20de=20d=C3=A9bogage=20et=20am=C3=A9liorer=20la=20gestion=20de?=
 =?UTF-8?q?s=20param=C3=A8tres=20dans=20le=20code=20de=20configuration=20T?=
 =?UTF-8?q?uya?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/config/i18n/de.json                 |  2 -
 front/src/config/i18n/en.json                 |  2 -
 front/src/config/i18n/fr.json                 |  2 -
 .../all/tuya/setup-page/SetupTab.jsx          | 18 ++++--
 server/services/tuya/api/tuya.controller.js   |  5 +-
 server/services/tuya/lib/tuya.localPoll.js    |  2 +
 .../services/tuya/lib/tuya.localPoll.test.js  | 56 ++++++++++---------
 7 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 49d438de78..6d36a3d596 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1231,7 +1231,6 @@
         "title": "In deinem Tuya-Cloud-Account erkannte Geräte",
         "description": "Tuya-Geräte werden automatisch erkannt. Deine Tuya-Geräte müssen zuerst zu deinem Tuya-Cloud-Account hinzugefügt werden.",
         "localDiscoveryInfo": "Lokale Erkennung nutzt UDP-Broadcast. Starte den lokalen UDP-Scan und gib bei Bedarf lokale IP und Protokollversion ein und nutze \"Lokales DPS abfragen\".",
-        "scanInProgress": "Scan läuft... Cloud-Geräte werden abgerufen.",
         "scanCloudInProgress": "Scan läuft... Cloud-Geräte werden abgerufen. Das kann etwas dauern.",
         "scanLocalInProgressConnected": "Scan läuft... Lokale Informationen der Geräte werden abgerufen. Das kann etwas dauern.",
         "scanLocalInProgressDisconnected": "Scan läuft... Lokale Geräte werden abgerufen. Das kann etwas dauern.",
@@ -1277,7 +1276,6 @@
         "saveLabel": "Konfiguration sichern und verbinden",
         "error": "Beim Sichern der Konfiguration ist ein Fehler aufgetreten.",
         "connecting": "Konfiguration gesichert. Die Verbindung mit deinem Tuya-Cloud-Account wird jetzt hergestellt …",
-        "connected": "Du hast dich erfolgreich mit dem Tuya-Cloud-Account verbunden!",
         "connectionError": "Fehler beim Verbinden. Bitte überprüfe deine Konfiguration.",
         "notConfigured": "Tuya-Cloud-Verbindungsdaten fehlen oder sind unvollständig.",
         "connectedAfterSave": "Du hast dich erfolgreich mit dem Tuya-Cloud-Account verbunden!",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index b582d6b24d..6fde93b640 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1126,7 +1126,6 @@
         "title": "Devices detected on your Tuya cloud account",
         "description": "Tuya devices are automatically discovered. Your Tuya devices need to be added to your Tuya cloud account before.",
         "localDiscoveryInfo": "Local discovery uses UDP broadcast. Run the local UDP scan, then if needed enter the local IP and protocol version and use \"Poll local DPS\".",
-        "scanInProgress": "Scan in progress... retrieving cloud devices.",
         "scanCloudInProgress": "Scan in progress... retrieving cloud devices. This can take a while.",
         "scanLocalInProgressConnected": "Scan in progress... retrieving local information for devices. This can take a while.",
         "scanLocalInProgressDisconnected": "Scan in progress... retrieving local devices. This can take a while.",
@@ -1174,7 +1173,6 @@
         "connecting": "Configuration saved. Now connecting to your Tuya cloud account...",
         "connectionError": "Error while connecting, please check your configuration.",
         "notConfigured": "Tuya cloud connection details are missing or incomplete.",
-        "connected": "Connected to the Tuya cloud account with success !",
         "connectedAfterSave": "Connected to the Tuya cloud account with success!",
         "connectedStatus": "Connected to the Tuya cloud account.",
         "disconnectSuccess": "Disconnected from the Tuya cloud account with success! Local service still works (it will not auto-reconnect when Gladys restarts).",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index b51ecca518..cd97220837 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1361,7 +1361,6 @@
         "title": "Appareils détectés sur votre compte cloud Tuya",
         "description": "Les appareils Tuya sont automatiquement découverts. Vos appareils Tuya doivent être ajoutés à votre compte cloud Tuya avant.",
         "localDiscoveryInfo": "La découverte locale utilise le broadcast UDP. Lancez le scan UDP local puis, si besoin, renseignez l'IP locale et la version du protocole, et utilisez \"Poll local des DP\".",
-        "scanInProgress": "Scan en cours... récupération cloud des appareils.",
         "scanCloudInProgress": "Scan en cours... récupération cloud des appareils. Cela peut prendre un moment.",
         "scanLocalInProgressConnected": "Scan en cours... récupération des informations locales des appareils. Cela peut prendre un moment.",
         "scanLocalInProgressDisconnected": "Scan en cours... récupération des appareils en local. Cela peut prendre un moment.",
@@ -1409,7 +1408,6 @@
         "connecting": "Configuration sauvegardée. Connexion à votre compte cloud Tuya...",
         "connectionError": "Erreur lors de la connexion, veuillez vérifier votre configuration.",
         "notConfigured": "Informations de connexion au compte cloud Tuya non renseignées ou manquantes !",
-        "connected": "Connexion au compte cloud Tuya réussie !",
         "connectedAfterSave": "Connexion au compte cloud Tuya réussie !",
         "connectedStatus": "Connecté au compte cloud Tuya.",
         "disconnectSuccess": "Déconnexion du compte cloud Tuya réussie ! Le service local fonctionne toujours (vous ne serez pas reconnecté automatiquement au redémarrage de Gladys).",
diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 26faa2e512..0370d501b2 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -141,31 +141,37 @@ class SetupTab extends Component {
       tuyaJustSavedMissing: false
     });
     try {
+      const tuyaEndpoint = (this.state.tuyaEndpoint || '').trim();
+      const tuyaAccessKey = (this.state.tuyaAccessKey || '').trim();
+      const tuyaSecretKey = (this.state.tuyaSecretKey || '').trim();
+      const tuyaAppAccountId = (this.state.tuyaAppAccountId || '').trim();
+      const tuyaAppUsername = (this.state.tuyaAppUsername || '').trim();
+
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_ENDPOINT', {
-        value: this.state.tuyaEndpoint
+        value: tuyaEndpoint
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_ACCESS_KEY', {
-        value: this.state.tuyaAccessKey.trim()
+        value: tuyaAccessKey
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_SECRET_KEY', {
-        value: this.state.tuyaSecretKey.trim()
+        value: tuyaSecretKey
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_APP_ACCOUNT_UID', {
-        value: this.state.tuyaAppAccountId.trim()
+        value: tuyaAppAccountId
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_APP_USERNAME', {
-        value: this.state.tuyaAppUsername.trim()
+        value: tuyaAppUsername
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_MANUAL_DISCONNECT', {
         value: false
       });
 
-      const configured = !!(this.state.tuyaEndpoint && this.state.tuyaAccessKey && this.state.tuyaSecretKey);
+      const configured = !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey);
       if (!configured) {
         this.setState({
           tuyaSaveSettingsStatus: RequestStatus.Success,
diff --git a/server/services/tuya/api/tuya.controller.js b/server/services/tuya/api/tuya.controller.js
index cced2fb982..373cd6800a 100644
--- a/server/services/tuya/api/tuya.controller.js
+++ b/server/services/tuya/api/tuya.controller.js
@@ -20,8 +20,9 @@ module.exports = function TuyaController(tuyaManager) {
    * @apiGroup Tuya
    */
   async function localPoll(req, res) {
-    const result = await tuyaManager.localPoll(req.body);
-    const updatedDevice = updateDiscoveredDeviceAfterLocalPoll(tuyaManager, req.body);
+    const payload = req.body || {};
+    const result = await tuyaManager.localPoll(payload);
+    const updatedDevice = updateDiscoveredDeviceAfterLocalPoll(tuyaManager, payload);
 
     if (updatedDevice) {
       res.json({
diff --git a/server/services/tuya/lib/tuya.localPoll.js b/server/services/tuya/lib/tuya.localPoll.js
index faffd522ec..87783ab6aa 100644
--- a/server/services/tuya/lib/tuya.localPoll.js
+++ b/server/services/tuya/lib/tuya.localPoll.js
@@ -100,6 +100,7 @@ async function localPoll(payload) {
       throw new BadParameters(errorMessage);
     }
     logger.debug(`[Tuya][localPoll] device=${deviceId} dps=${JSON.stringify(data)}`);
+    tuyaLocal.removeListener('error', onError);
     return data;
   } catch (e) {
     if (lastError && (!e || e.message !== lastError.message)) {
@@ -107,6 +108,7 @@ async function localPoll(payload) {
     }
     logger.warn(`[Tuya][localPoll] failed for device=${deviceId}`, e);
     try {
+      tuyaLocal.removeListener('error', onError);
       await tuyaLocal.disconnect();
     } catch (err) {
       // ignore
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index 5d0bc9de7a..1cf8aa5f28 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -139,36 +139,38 @@ describe('TuyaHandler.localPoll', () => {
 
   it('should timeout', async () => {
     const clock = sinon.useFakeTimers();
-    const connect = sinon.stub().resolves();
-    const get = sinon.stub().returns(new Promise(() => {}));
-    const disconnect = sinon.stub().resolves();
-    function TuyAPIStub() {
-      this.connect = connect;
-      this.get = get;
-      this.disconnect = disconnect;
-      attachEventHandlers(this);
-    }
-    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
-      tuyapi: TuyAPIStub,
-    });
-    const promise = localPoll({
-      deviceId: 'device',
-      ip: '1.1.1.1',
-      localKey: 'key',
-      protocolVersion: '3.3',
-      timeoutMs: 1000,
-    });
-    await clock.tickAsync(1100);
     try {
-      await promise;
-    } catch (e) {
-      expect(e).to.be.instanceOf(BadParameters);
-      expect(e.message).to.equal('Local poll timeout');
+      const connect = sinon.stub().resolves();
+      const get = sinon.stub().returns(new Promise(() => {}));
+      const disconnect = sinon.stub().resolves();
+      const TuyAPIStub = function TuyAPIStub() {
+        this.connect = connect;
+        this.get = get;
+        this.disconnect = disconnect;
+        attachEventHandlers(this);
+      };
+      const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+        tuyapi: TuyAPIStub,
+      });
+      const promise = localPoll({
+        deviceId: 'device',
+        ip: '1.1.1.1',
+        localKey: 'key',
+        protocolVersion: '3.3',
+        timeoutMs: 1000,
+      });
+      await clock.tickAsync(1100);
+      try {
+        await promise;
+      } catch (e) {
+        expect(e).to.be.instanceOf(BadParameters);
+        expect(e.message).to.equal('Local poll timeout');
+        return;
+      }
+      throw new Error('Expected error');
+    } finally {
       clock.restore();
-      return;
     }
-    clock.restore();
-    throw new Error('Expected error');
   });
 
   it('should reject on socket error listener', async () => {

From c5edbbc769b4eda9cc1ac9c4950e09b8aa936d30 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Wed, 25 Feb 2026 17:08:37 +0100
Subject: [PATCH 27/90] ci: rerun


From c65e26474c58a3e516da8b4737955bcce9611322 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 21 Feb 2026 17:44:40 +0100
Subject: [PATCH 28/90] =?UTF-8?q?feat(tuya):=20ajouter=20le=20support=20de?=
 =?UTF-8?q?=20l'UID=20du=20compte=20d'application=20Tuya,=20am=C3=A9liorer?=
 =?UTF-8?q?=20la=20gestion=20des=20erreurs=20de=20connexion=20et=20mettre?=
 =?UTF-8?q?=20=C3=A0=20jour=20les=20tests=20associ=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/config/i18n/de.json                 | 10 ++-
 front/src/config/i18n/en.json                 | 10 ++-
 front/src/config/i18n/fr.json                 | 12 +--
 .../integration/all/tuya/TuyaDeviceBox.jsx    |  3 +-
 .../all/tuya/setup-page/SetupTab.jsx          | 28 +++---
 server/services/tuya/index.js                 | 75 +++++++++++++++-
 server/services/tuya/lib/index.js             |  1 +
 server/services/tuya/lib/tuya.connect.js      | 87 ++++++++++++++++++-
 .../tuya/lib/tuya.getConfiguration.js         |  3 +
 server/services/tuya/lib/tuya.getStatus.js    |  7 +-
 server/services/tuya/lib/tuya.init.js         | 12 ++-
 server/services/tuya/lib/tuya.loadDevices.js  | 10 +++
 .../tuya/lib/tuya.saveConfiguration.js        |  3 +-
 server/services/tuya/lib/utils/tuya.config.js | 25 ++++++
 .../services/tuya/lib/utils/tuya.constants.js |  1 +
 server/test/services/tuya/index.test.js       |  9 +-
 .../services/tuya/lib/tuya.connect.test.js    | 12 ++-
 .../tuya/lib/tuya.getConfiguration.test.js    |  7 +-
 .../services/tuya/lib/tuya.getStatus.test.js  |  5 ++
 .../test/services/tuya/lib/tuya.init.test.js  | 12 ++-
 .../services/tuya/lib/tuya.localScan.test.js  |  7 +-
 .../tuya/lib/tuya.saveConfiguration.test.js   |  5 +-
 server/test/services/tuya/tuya.mock.test.js   |  1 +
 23 files changed, 297 insertions(+), 48 deletions(-)
 create mode 100644 server/services/tuya/lib/utils/tuya.config.js

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 6d36a3d596..93133aa6af 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1219,10 +1219,10 @@
         "localPollButton": "Lokales DPS abfragen",
         "localPollInProgress": "Lokaler Poll läuft... Protokoll {{protocol}}.",
         "localPollHelp": "Wenn du das Protokoll kennst, wähle es aus und klicke zum Prüfen. Wenn nicht, klicke direkt für einen vollständigen Scan (dauert länger).",
-        "localPollRequired": "Lokaler Modus ist aktiv und lokale Einstellungen wurden geändert. Bitte \"Lokales DPS abfragen\" erfolgreich ausführen, bevor du speicherst. Wenn der lokale Modus nicht funktioniert (z. B. Protokoll 3.5 noch nicht unterstützt), schalte zurück in den Cloud-Modus.",
+        "localPollRequired": "Lokaler Modus ist aktiv und lokale Einstellungen wurden geändert. Bitte \"Lokales DPS abfragen\" erfolgreich ausführen, bevor du speicherst. Wenn der lokale Modus nicht funktioniert, schalte zurück in den Cloud-Modus.",
         "localPollSuccess": "Lokaler Poll OK.",
         "localPollError": "Lokaler Poll fehlgeschlagen:",
-        "protocol35Unsupported": "Protokoll 3.5 wird lokal noch nicht unterstützt.",
+        "createGithubIssue": "Dieses Gerät vorschlagen",
         "githubIssueInfo": "Ein Bericht wird mit den Gerätedetails gesendet. Sensible Daten (Lokaler Schlüssel und IP-Adresse) werden maskiert.",
         "productIdLabel": "Produkt-ID",
         "productKeyLabel": "Produktschlüssel"
@@ -1254,8 +1254,6 @@
         "descriptionTrial": "Tuya-Cloud-Projekte haben eine Testphase: verlängere sie regelmäßig, um Unterbrechungen zu vermeiden.",
         "localTitle": "<br /><strong>Lokal</strong><br />",
         "descriptionLocalMode": "Der lokale Modus kann nach der Cloud-Konfiguration genutzt werden: Trage lokale IP und Protokollversion pro Gerät ein, um lokal abzufragen. Wenn die Geräte im selben Netzwerk wie der Gladys-Host sind, werden IP-Erkennung und Protokollversion automatisch erkannt. So kannst du die Cloud-Verlängerung umgehen, aber für das Hinzufügen neuer Geräte in der Tuya-App bleibt die Cloud nötig.",
-        "limitationsTitle": "<br /><strong>Aktuelle Einschränkungen</strong><br />",
-        "limitationsProtocol35": "Protokoll 3.5 wird lokal noch nicht unterstützt.",
         "endpoints": {
           "china": "China",
           "westernAmerica": "Westamerika",
@@ -1277,6 +1275,10 @@
         "error": "Beim Sichern der Konfiguration ist ein Fehler aufgetreten.",
         "connecting": "Konfiguration gesichert. Die Verbindung mit deinem Tuya-Cloud-Account wird jetzt hergestellt …",
         "connectionError": "Fehler beim Verbinden. Bitte überprüfe deine Konfiguration.",
+        "errorInvalidEndpoint": "Der Endpunkt scheint falsch zu sein. Bitte überprüfe den Endpunkt.",
+        "errorInvalidClientId": "Die Client ID scheint ungültig zu sein. Bitte überprüfe die Client ID.",
+        "errorInvalidClientSecret": "Das Client Secret scheint ungültig zu sein. Bitte überprüfe das Client Secret.",
+        "errorInvalidAppAccountUid": "Die App-Account-UID scheint ungültig zu sein. Bitte überprüfe die App-Account-UID.",
         "notConfigured": "Tuya-Cloud-Verbindungsdaten fehlen oder sind unvollständig.",
         "connectedAfterSave": "Du hast dich erfolgreich mit dem Tuya-Cloud-Account verbunden!",
         "connectedStatus": "Mit dem Tuya-Cloud-Account verbunden.",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index 6fde93b640..4ca026add9 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1114,10 +1114,10 @@
         "localPollButton": "Poll local DPS",
         "localPollInProgress": "Local poll in progress (protocol {{protocol}})...",
         "localPollHelp": "If you know the protocol, select it then click the button to verify. If you don't, just click the button for a full scan (it takes longer).",
-        "localPollRequired": "Local mode is enabled and local settings changed. Run \"Poll local DPS\" successfully before saving. If local mode can't work (e.g. protocol 3.5 not supported yet), switch back to cloud mode.",
+        "localPollRequired": "Local mode is enabled and local settings changed. Run \"Poll local DPS\" successfully before saving. If local mode doesn't work, switch back to cloud mode.",
         "localPollSuccess": "Local poll OK.",
         "localPollError": "Local poll failed:",
-        "protocol35Unsupported": "Protocol 3.5 is not supported locally yet.",
+        "createGithubIssue": "Suggest this device",
         "githubIssueInfo": "A report will be sent with the device details. Sensitive data (local key and IP) is masked.",
         "productIdLabel": "Product ID",
         "productKeyLabel": "Product Key"
@@ -1149,8 +1149,6 @@
         "descriptionTrial": "Tuya Cloud projects have a trial period: make sure to renew or extend it regularly to avoid service interruptions.",
         "localTitle": "<br /><strong>Local</strong><br />",
         "descriptionLocalMode": "Local mode can be used after the cloud setup: provide the local IP and protocol version on each device to poll locally. If devices are on the same network as the Gladys machine, the IP discovery and protocol version are detected automatically. This lets you avoid renewing the cloud trial, but the cloud is still needed when you add a new device from the Tuya app.",
-        "limitationsTitle": "<br /><strong>Current limitations</strong><br />",
-        "limitationsProtocol35": "Protocol 3.5 is not yet supported locally.",
         "endpoints": {
           "china": "China",
           "westernAmerica": "Western America",
@@ -1172,6 +1170,10 @@
         "error": "An error occurred while saving configuration.",
         "connecting": "Configuration saved. Now connecting to your Tuya cloud account...",
         "connectionError": "Error while connecting, please check your configuration.",
+        "errorInvalidEndpoint": "Endpoint seems incorrect. Please verify your endpoint.",
+        "errorInvalidClientId": "Client ID seems invalid. Please verify your Client ID.",
+        "errorInvalidClientSecret": "Client Secret seems invalid. Please verify your Client Secret.",
+        "errorInvalidAppAccountUid": "App account UID seems invalid. Please verify your App account UID.",
         "notConfigured": "Tuya cloud connection details are missing or incomplete.",
         "connectedAfterSave": "Connected to the Tuya cloud account with success!",
         "connectedStatus": "Connected to the Tuya cloud account.",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index cd97220837..fe2e85c41b 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1349,10 +1349,10 @@
         "localPollButton": "Poll local des DP",
         "localPollInProgress": "Poll local en cours... protocole {{protocol}}.",
         "localPollHelp": "Si vous connaissez le protocole, sélectionnez-le puis cliquez pour vérifier. Sinon, cliquez directement pour un scan complet (plus long).",
-        "localPollRequired": "Le mode local est activé et les paramètres locaux ont changé. Lancez un poll local des DP avec succès avant de sauvegarder. Si vous n'arrivez pas à faire fonctionner le local (ex: protocole 3.5 non pris en charge), repassez en mode cloud.",
+        "localPollRequired": "Le mode local est activé et les paramètres locaux ont changé. Lancez un poll local des DP avec succès avant de sauvegarder. Si vous n'arrivez pas à faire fonctionner le local, repassez en mode cloud.",
         "localPollSuccess": "Poll local OK.",
         "localPollError": "Échec du poll local :",
-        "protocol35Unsupported": "Le protocole 3.5 n'est pas pris en charge en local pour le moment.",
+        "createGithubIssue": "Proposer ce périphérique",
         "githubIssueInfo": "Un rapport sera envoyé avec les informations du périphérique. Les données sensibles (clé locale et IP) sont masquées.",
         "productIdLabel": "Identifiant produit",
         "productKeyLabel": "Clé produit"
@@ -1384,8 +1384,6 @@
         "descriptionTrial": "Les projets Tuya Cloud ont une période d'essai : pensez à la renouveler ou l'étendre régulièrement pour éviter les coupures.",
         "localTitle": "<br /><strong>Local</strong><br />",
         "descriptionLocalMode": "Le mode local peut être utilisé après la configuration cloud : renseignez l'IP locale et la version du protocole sur chaque appareil pour interroger en local. Si les appareils sont sur le même réseau que la machine Gladys, la découverte IP et la version du protocole sont automatiquement détectées. Ce mode permet de se passer du renouvellement cloud, mais il reste nécessaire lors de l'ajout d'un nouvel appareil depuis l'application Tuya.",
-        "limitationsTitle": "<br /><strong>Limites actuelles</strong><br />",
-        "limitationsProtocol35": "Le protocole 3.5 n'est pas encore pris en charge en local.",
         "endpoints": {
           "china": "China",
           "westernAmerica": "Western America",
@@ -1407,11 +1405,15 @@
         "error": "Une erreur s'est produite lors de la sauvegarde de la configuration.",
         "connecting": "Configuration sauvegardée. Connexion à votre compte cloud Tuya...",
         "connectionError": "Erreur lors de la connexion, veuillez vérifier votre configuration.",
+        "errorInvalidEndpoint": "L'endpoint semble incorrect. Veuillez vérifier l'endpoint.",
+        "errorInvalidClientId": "Le Client ID semble invalide. Veuillez vérifier le Client ID.",
+        "errorInvalidClientSecret": "Le Client Secret semble invalide. Veuillez vérifier le Client Secret.",
+        "errorInvalidAppAccountUid": "L'UID du compte d'application semble invalide. Veuillez vérifier l'UID du compte d'application.",
         "notConfigured": "Informations de connexion au compte cloud Tuya non renseignées ou manquantes !",
         "connectedAfterSave": "Connexion au compte cloud Tuya réussie !",
         "connectedStatus": "Connecté au compte cloud Tuya.",
         "disconnectSuccess": "Déconnexion du compte cloud Tuya réussie ! Le service local fonctionne toujours (vous ne serez pas reconnecté automatiquement au redémarrage de Gladys).",
-        "disconnectedUnexpected": "Vous avez été déconnecté du cloud Tuya ! Vérifier vos informations de connexion et l'état de votre abonnement d'essai <a href=\"https://eu.platform.tuya.com/cloud/products?productType=all\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Core</a>.",
+        "disconnectedUnexpected": "Vous avez été déconnecté du cloud Tuya ! Vérifiez vos informations de connexion et l'état de votre abonnement d'essai <a href=\"https://eu.platform.tuya.com/cloud/products?productType=all\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Core</a>.",
         "disconnectedManual": "Déconnecté du cloud Tuya ! Le service local fonctionne toujours (vous ne serez pas reconnecté automatiquement au redémarrage de Gladys).",
         "disconnectedMissingConfig": "Déconnecté du cloud Tuya.",
         "disconnectLabel": "Se déconnecter du cloud"
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 0182d2f097..4e66542222 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -428,8 +428,7 @@ class TuyaDeviceBox extends Component {
     const displayIp = showCloudIp ? cloudIp : ipAddress;
     const isValidIp =
       typeof ipAddress === 'string' && /^(25[0-5]|2[0-4]\d|1?\d?\d)(\.(25[0-5]|2[0-4]\d|1?\d?\d)){3}$/.test(ipAddress);
-    const isDifferentFromCloud = !cloudIp || ipAddress !== cloudIp;
-    const canPollLocal = localOverride === true && isValidIp && localKey && isDifferentFromCloud;
+    const canPollLocal = localOverride === true && isValidIp && localKey;
     const hasLocalChanges = hasDeviceChanged(device, this.state.baselineDevice);
     const currentLocalConfig = getLocalConfig(device);
     const baselineLocalConfig = getLocalConfig(this.state.baselineDevice);
diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 0370d501b2..5bd97fbb2e 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -167,11 +167,15 @@ class SetupTab extends Component {
         value: tuyaAppUsername
       });
 
+      await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_LAST_CONNECTED_CONFIG_HASH', {
+        value: ''
+      });
+
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_MANUAL_DISCONNECT', {
-        value: false
+        value: 'false'
       });
 
-      const configured = !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey);
+      const configured = !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId);
       if (!configured) {
         this.setState({
           tuyaSaveSettingsStatus: RequestStatus.Success,
@@ -268,6 +272,16 @@ class SetupTab extends Component {
     });
   };
 
+  renderTuyaError = error => {
+    if (!error) {
+      return null;
+    }
+    if (typeof error === 'string' && error.startsWith('integration.tuya.setup.')) {
+      return <Text id={error} />;
+    }
+    return <code>{error}</code>;
+  };
+
   updateConfiguration = e => {
     const { name, value } = e.target;
     this.setState(prevState => {
@@ -331,9 +345,7 @@ class SetupTab extends Component {
                 <div class="alert alert-danger">
                   <Text id="integration.tuya.setup.error" />
                   {state.tuyaConnectionError && !state.tuyaConnecting && !state.tuyaConnected && (
-                    <div class="mt-2">
-                      <code>{state.tuyaConnectionError}</code>
-                    </div>
+                    <div class="mt-2">{this.renderTuyaError(state.tuyaConnectionError)}</div>
                   )}
                 </div>
               )}
@@ -383,9 +395,7 @@ class SetupTab extends Component {
                 <div class="alert alert-danger">
                   <Text id="integration.tuya.setup.connectionError" />
                   {state.tuyaConnectionError && (
-                    <div class="mt-2">
-                      <code>{state.tuyaConnectionError}</code>
-                    </div>
+                    <div class="mt-2">{this.renderTuyaError(state.tuyaConnectionError)}</div>
                   )}
                 </div>
               )}
@@ -400,8 +410,6 @@ class SetupTab extends Component {
                 <MarkupText id="integration.tuya.setup.descriptionTrial" />
                 <MarkupText id="integration.tuya.setup.localTitle" />
                 <MarkupText id="integration.tuya.setup.descriptionLocalMode" />
-                <MarkupText id="integration.tuya.setup.limitationsTitle" />
-                <MarkupText id="integration.tuya.setup.limitationsProtocol35" />
               </p>
 
               <form>
diff --git a/server/services/tuya/index.js b/server/services/tuya/index.js
index 8d8a29d375..de3d3397a3 100644
--- a/server/services/tuya/index.js
+++ b/server/services/tuya/index.js
@@ -7,33 +7,96 @@ const { STATUS } = require('./lib/utils/tuya.constants');
 module.exports = function TuyaService(gladys, serviceId) {
   const tuyaHandler = new TuyaHandler(gladys, serviceId);
   const RECONNECT_INTERVAL_MS = 1000 * 60 * 30;
+  const QUICK_RECONNECT_ATTEMPTS = 3;
+  const QUICK_RECONNECT_DELAY_MS = 1000 * 3;
   let reconnectInterval = null;
+  let quickReconnectTimeouts = [];
+  let quickReconnectInProgress = false;
 
   /**
    * @description Attempt to reconnect to Tuya if configured and not manually disconnected.
-   * @returns {Promise<void>} Promise of nothing.
+   * @returns {Promise<boolean>} Returns true if reconnect should be retried, false otherwise.
    * @example
    * await tryReconnect();
    */
   async function tryReconnect() {
     try {
+      if (!tuyaHandler.autoReconnectAllowed) {
+        return false;
+      }
       const status = await tuyaHandler.getStatus();
       if (!status.configured || status.manual_disconnect) {
-        return;
+        return false;
       }
       if (
         tuyaHandler.status === STATUS.CONNECTED ||
         tuyaHandler.status === STATUS.CONNECTING ||
         tuyaHandler.status === STATUS.DISCOVERING_DEVICES
       ) {
-        return;
+        return false;
       }
       logger.info('Tuya is disconnected, attempting auto-reconnect...');
       const configuration = await tuyaHandler.getConfiguration();
       await tuyaHandler.connect(configuration);
+      return tuyaHandler.status !== STATUS.CONNECTED;
     } catch (e) {
       logger.warn('Auto-reconnect to Tuya failed:', e.message || e);
+      return true;
+    }
+  }
+
+  /**
+   * @description Clear pending quick reconnect timers and reset state.
+   * @example
+   * clearQuickReconnects();
+   */
+  function clearQuickReconnects() {
+    if (quickReconnectTimeouts.length > 0) {
+      quickReconnectTimeouts.forEach((timeoutId) => clearTimeout(timeoutId));
+      quickReconnectTimeouts = [];
     }
+    quickReconnectInProgress = false;
+  }
+
+  /**
+   * @description Schedule quick reconnect attempts when disconnected.
+   * @returns {Promise<void>} Resolves once the current attempt is finished.
+   * @example
+   * await scheduleQuickReconnects();
+   */
+  function scheduleQuickReconnects() {
+    if (quickReconnectInProgress) {
+      return Promise.resolve();
+    }
+    quickReconnectInProgress = true;
+    let attempts = 0;
+
+    const runAttempt = async () => {
+      attempts += 1;
+      const shouldRetry = await tryReconnect();
+      const isConnecting =
+        tuyaHandler.status === STATUS.CONNECTED ||
+        tuyaHandler.status === STATUS.CONNECTING ||
+        tuyaHandler.status === STATUS.DISCOVERING_DEVICES;
+
+      if (!shouldRetry || isConnecting) {
+        clearQuickReconnects();
+        return;
+      }
+
+      if (attempts < QUICK_RECONNECT_ATTEMPTS) {
+        const timeoutId = setTimeout(runAttempt, QUICK_RECONNECT_DELAY_MS);
+        if (timeoutId && typeof timeoutId.unref === 'function') {
+          timeoutId.unref();
+        }
+        quickReconnectTimeouts.push(timeoutId);
+        return;
+      }
+
+      quickReconnectInProgress = false;
+    };
+
+    return runAttempt();
   }
 
   /**
@@ -48,8 +111,11 @@ module.exports = function TuyaService(gladys, serviceId) {
     if (tuyaHandler.status === STATUS.CONNECTED) {
       await tuyaHandler.loadDevices();
     }
+    if (tuyaHandler.status !== STATUS.CONNECTED && tuyaHandler.autoReconnectAllowed) {
+      scheduleQuickReconnects();
+    }
     if (!reconnectInterval) {
-      reconnectInterval = setInterval(tryReconnect, RECONNECT_INTERVAL_MS);
+      reconnectInterval = setInterval(scheduleQuickReconnects, RECONNECT_INTERVAL_MS);
     }
   }
 
@@ -65,6 +131,7 @@ module.exports = function TuyaService(gladys, serviceId) {
       clearInterval(reconnectInterval);
       reconnectInterval = null;
     }
+    clearQuickReconnects();
     await tuyaHandler.disconnect();
   }
 
diff --git a/server/services/tuya/lib/index.js b/server/services/tuya/lib/index.js
index 05615b6ccb..8c0d57441c 100644
--- a/server/services/tuya/lib/index.js
+++ b/server/services/tuya/lib/index.js
@@ -25,6 +25,7 @@ const TuyaHandler = function TuyaHandler(gladys, serviceId) {
   this.connector = null;
   this.status = STATUS.NOT_INITIALIZED;
   this.lastError = null;
+  this.autoReconnectAllowed = false;
 };
 
 TuyaHandler.prototype.init = init;
diff --git a/server/services/tuya/lib/tuya.connect.js b/server/services/tuya/lib/tuya.connect.js
index 47986a6ab1..9c4dc8cce7 100644
--- a/server/services/tuya/lib/tuya.connect.js
+++ b/server/services/tuya/lib/tuya.connect.js
@@ -4,7 +4,73 @@ const logger = require('../../../utils/logger');
 const { ServiceNotConfiguredError } = require('../../../utils/coreErrors');
 const { WEBSOCKET_MESSAGE_TYPES, EVENTS } = require('../../../utils/constants');
 
-const { STATUS, GLADYS_VARIABLES } = require('./utils/tuya.constants');
+const { STATUS, GLADYS_VARIABLES, API } = require('./utils/tuya.constants');
+const { buildConfigHash } = require('./utils/tuya.config');
+
+/**
+ * @description Map Tuya errors to user-facing i18n keys and retry policy.
+ * @param {Error} error - Error thrown during connection.
+ * @returns {object|null} Mapping info or null when unknown.
+ * @example
+ * const mapped = mapConnectionError(new Error('GET_TOKEN_FAILED 2009, clientId is invalid'));
+ */
+const mapConnectionError = (error) => {
+  const rawMessage = error && error.message ? error.message : '';
+  const message = rawMessage.toLowerCase();
+  const code = error && error.code ? String(error.code).toLowerCase() : '';
+
+  if (code === '2009' || message.includes('clientid is invalid') || message.includes('get_token_failed 2009')) {
+    return { key: 'integration.tuya.setup.errorInvalidClientId', disableAutoReconnect: true };
+  }
+
+  if (code === '1004' || message.includes('sign invalid') || message.includes('get_token_failed 1004')) {
+    return { key: 'integration.tuya.setup.errorInvalidClientSecret', disableAutoReconnect: true };
+  }
+
+  if (code === '28841107' || message.includes('data center is suspended') || message.includes('data center')) {
+    return { key: 'integration.tuya.setup.errorInvalidEndpoint', disableAutoReconnect: true };
+  }
+
+  if (
+    code === '1106' ||
+    message.includes('permission deny') ||
+    code === 'tuya_app_account_uid_missing' ||
+    code === 'tuya_app_account_uid_invalid'
+  ) {
+    return { key: 'integration.tuya.setup.errorInvalidAppAccountUid', disableAutoReconnect: true };
+  }
+
+  return null;
+};
+
+/**
+ * @description Validate Tuya app account UID by calling the devices endpoint.
+ * @param {object} connector - Tuya connector instance.
+ * @param {string} appAccountId - Tuya app account UID.
+ * @returns {Promise<void>} Resolves when valid.
+ * @example
+ * await validateAppAccount(connector, 'uid');
+ */
+const validateAppAccount = async (connector, appAccountId) => {
+  if (!appAccountId) {
+    const error = new Error('TUYA_APP_ACCOUNT_UID_MISSING');
+    error.code = 'TUYA_APP_ACCOUNT_UID_MISSING';
+    throw error;
+  }
+  const response = await connector.request({
+    method: 'GET',
+    path: `${API.PUBLIC_VERSION_1_0}/users/${appAccountId}/devices`,
+    query: {
+      page_no: 1,
+      page_size: 1,
+    },
+  });
+  if (response && response.success === false) {
+    const error = new Error(response.msg || response.message || 'TUYA_APP_ACCOUNT_UID_INVALID');
+    error.code = response.code || 'TUYA_APP_ACCOUNT_UID_INVALID';
+    throw error;
+  }
+};
 
 /**
  * @description Connect to Tuya cloud.
@@ -13,7 +79,7 @@ const { STATUS, GLADYS_VARIABLES } = require('./utils/tuya.constants');
  * connect({baseUrl, accessKey, secretKey});
  */
 async function connect(configuration) {
-  const { baseUrl, accessKey, secretKey } = configuration;
+  const { baseUrl, accessKey, secretKey, appAccountId } = configuration;
 
   if (!baseUrl || !accessKey || !secretKey) {
     this.status = STATUS.NOT_INITIALIZED;
@@ -37,13 +103,26 @@ async function connect(configuration) {
 
   try {
     await this.connector.client.init();
-    await this.gladys.variable.setValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, false, this.serviceId);
+    await validateAppAccount(this.connector, appAccountId);
+    await this.gladys.variable.setValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, 'false', this.serviceId);
+    const configHash = buildConfigHash(configuration);
+    await this.gladys.variable.setValue(GLADYS_VARIABLES.LAST_CONNECTED_CONFIG_HASH, configHash, this.serviceId);
+    this.autoReconnectAllowed = true;
     this.status = STATUS.CONNECTED;
     logger.debug('Connected to Tuya');
   } catch (e) {
     this.status = STATUS.ERROR;
-    const message = e && e.message ? e.message : 'Unknown error';
+    const mapped = mapConnectionError(e);
+    let message = 'Unknown error';
+    if (mapped) {
+      message = mapped.key;
+    } else if (e && e.message) {
+      message = e.message;
+    }
     this.lastError = message;
+    if (mapped && mapped.disableAutoReconnect) {
+      this.autoReconnectAllowed = false;
+    }
     logger.error('Error connecting to Tuya:', e);
     this.gladys.event.emit(EVENTS.WEBSOCKET.SEND_ALL, {
       type: WEBSOCKET_MESSAGE_TYPES.TUYA.ERROR,
diff --git a/server/services/tuya/lib/tuya.getConfiguration.js b/server/services/tuya/lib/tuya.getConfiguration.js
index 1938f77fa6..a5dbe4954a 100644
--- a/server/services/tuya/lib/tuya.getConfiguration.js
+++ b/server/services/tuya/lib/tuya.getConfiguration.js
@@ -13,6 +13,7 @@ async function getConfiguration() {
   const endpoint = await this.gladys.variable.getValue(GLADYS_VARIABLES.ENDPOINT, this.serviceId);
   const accessKey = await this.gladys.variable.getValue(GLADYS_VARIABLES.ACCESS_KEY, this.serviceId);
   const secretKey = await this.gladys.variable.getValue(GLADYS_VARIABLES.SECRET_KEY, this.serviceId);
+  const appAccountId = await this.gladys.variable.getValue(GLADYS_VARIABLES.APP_ACCOUNT_UID, this.serviceId);
   const appUsername = await this.gladys.variable.getValue(GLADYS_VARIABLES.APP_USERNAME, this.serviceId);
 
   logger.debug(`Tuya configuration: baseUrl='${endpoint}' accessKey='${accessKey}'`);
@@ -23,6 +24,8 @@ async function getConfiguration() {
     accessKey,
     secretKey,
     appUsername,
+    endpoint,
+    appAccountId,
   };
 }
 
diff --git a/server/services/tuya/lib/tuya.getStatus.js b/server/services/tuya/lib/tuya.getStatus.js
index 1cfcceaae2..3d2914dbaf 100644
--- a/server/services/tuya/lib/tuya.getStatus.js
+++ b/server/services/tuya/lib/tuya.getStatus.js
@@ -1,4 +1,5 @@
 const { GLADYS_VARIABLES, STATUS } = require('./utils/tuya.constants');
+const { normalizeBoolean } = require('./utils/tuya.normalize');
 
 /**
  * @description Get Tuya connection and configuration status.
@@ -10,11 +11,11 @@ async function getStatus() {
   const endpoint = await this.gladys.variable.getValue(GLADYS_VARIABLES.ENDPOINT, this.serviceId);
   const accessKey = await this.gladys.variable.getValue(GLADYS_VARIABLES.ACCESS_KEY, this.serviceId);
   const secretKey = await this.gladys.variable.getValue(GLADYS_VARIABLES.SECRET_KEY, this.serviceId);
+  const appAccountId = await this.gladys.variable.getValue(GLADYS_VARIABLES.APP_ACCOUNT_UID, this.serviceId);
   const manualDisconnect = await this.gladys.variable.getValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, this.serviceId);
 
-  const configured = Boolean(endpoint && accessKey && secretKey);
-  const manualDisconnectEnabled =
-    manualDisconnect === true || manualDisconnect === 'true' || manualDisconnect === '1' || manualDisconnect === 1;
+  const configured = Boolean(endpoint && accessKey && secretKey && appAccountId);
+  const manualDisconnectEnabled = normalizeBoolean(manualDisconnect);
 
   return {
     status: this.status || STATUS.NOT_INITIALIZED,
diff --git a/server/services/tuya/lib/tuya.init.js b/server/services/tuya/lib/tuya.init.js
index 4ec4ab64e7..18419a8bcd 100644
--- a/server/services/tuya/lib/tuya.init.js
+++ b/server/services/tuya/lib/tuya.init.js
@@ -1,4 +1,6 @@
 const { GLADYS_VARIABLES, STATUS } = require('./utils/tuya.constants');
+const { buildConfigHash } = require('./utils/tuya.config');
+const { normalizeBoolean } = require('./utils/tuya.normalize');
 const { EVENTS, WEBSOCKET_MESSAGE_TYPES } = require('../../../utils/constants');
 
 /**
@@ -8,9 +10,15 @@ const { EVENTS, WEBSOCKET_MESSAGE_TYPES } = require('../../../utils/constants');
  */
 async function init() {
   const configuration = await this.getConfiguration();
+  const lastConnectedHash = await this.gladys.variable.getValue(
+    GLADYS_VARIABLES.LAST_CONNECTED_CONFIG_HASH,
+    this.serviceId,
+  );
+  const currentHash = configuration ? buildConfigHash(configuration) : null;
+  const hasMatchingConfig = Boolean(lastConnectedHash && currentHash && lastConnectedHash === currentHash);
+  this.autoReconnectAllowed = hasMatchingConfig;
   const manualDisconnect = await this.gladys.variable.getValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, this.serviceId);
-  const manualDisconnectEnabled =
-    manualDisconnect === true || manualDisconnect === 'true' || manualDisconnect === '1' || manualDisconnect === 1;
+  const manualDisconnectEnabled = normalizeBoolean(manualDisconnect);
 
   if (manualDisconnectEnabled) {
     this.status = STATUS.NOT_INITIALIZED;
diff --git a/server/services/tuya/lib/tuya.loadDevices.js b/server/services/tuya/lib/tuya.loadDevices.js
index a0abbfdd6c..bfc3364308 100644
--- a/server/services/tuya/lib/tuya.loadDevices.js
+++ b/server/services/tuya/lib/tuya.loadDevices.js
@@ -10,6 +10,12 @@ const { API, GLADYS_VARIABLES } = require('./utils/tuya.constants');
  * await loadDevices();
  */
 async function loadDevices(pageNo = 1, pageSize = 100) {
+  if (!Number.isInteger(pageNo) || pageNo <= 0) {
+    throw new Error('pageNo must be a positive integer');
+  }
+  if (!Number.isInteger(pageSize) || pageSize <= 0) {
+    throw new Error('pageSize must be a positive integer');
+  }
   const sourceId = await this.gladys.variable.getValue(GLADYS_VARIABLES.APP_ACCOUNT_UID, this.serviceId);
 
   const responsePage = await this.connector.request({
@@ -20,6 +26,10 @@ async function loadDevices(pageNo = 1, pageSize = 100) {
       page_size: pageSize,
     },
   });
+  if (responsePage && responsePage.success === false) {
+    const message = responsePage.msg || responsePage.message || responsePage.code || 'Tuya API error';
+    throw new Error(message);
+  }
 
   const result = responsePage.result || [];
   const list = Array.isArray(result) ? result : result.list || [];
diff --git a/server/services/tuya/lib/tuya.saveConfiguration.js b/server/services/tuya/lib/tuya.saveConfiguration.js
index 1a013b1cf7..a4c0db5a72 100644
--- a/server/services/tuya/lib/tuya.saveConfiguration.js
+++ b/server/services/tuya/lib/tuya.saveConfiguration.js
@@ -17,7 +17,8 @@ async function saveConfiguration(configuration) {
   await this.gladys.variable.setValue(GLADYS_VARIABLES.SECRET_KEY, secretKey, this.serviceId);
   await this.gladys.variable.setValue(GLADYS_VARIABLES.APP_ACCOUNT_UID, appAccountId, this.serviceId);
   await this.gladys.variable.setValue(GLADYS_VARIABLES.APP_USERNAME, appUsername, this.serviceId);
-  await this.gladys.variable.setValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, false, this.serviceId);
+  await this.gladys.variable.setValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, 'false', this.serviceId);
+  await this.gladys.variable.setValue(GLADYS_VARIABLES.LAST_CONNECTED_CONFIG_HASH, '', this.serviceId);
 
   return configuration;
 }
diff --git a/server/services/tuya/lib/utils/tuya.config.js b/server/services/tuya/lib/utils/tuya.config.js
new file mode 100644
index 0000000000..f309a294d1
--- /dev/null
+++ b/server/services/tuya/lib/utils/tuya.config.js
@@ -0,0 +1,25 @@
+const crypto = require('crypto');
+
+/**
+ * @description Build a stable hash for the Tuya configuration.
+ * @param {object} config - Tuya configuration.
+ * @returns {string} SHA-256 hash.
+ * @example
+ * const hash = buildConfigHash({ endpoint: 'eu', accessKey: 'key', secretKey: 'secret', appAccountId: 'uid' });
+ */
+const buildConfigHash = (config = {}) => {
+  const payload = JSON.stringify({
+    endpoint: config.endpoint || '',
+    accessKey: config.accessKey || '',
+    secretKey: config.secretKey || '',
+    appAccountId: config.appAccountId || '',
+  });
+  return crypto
+    .createHash('sha256')
+    .update(payload)
+    .digest('hex');
+};
+
+module.exports = {
+  buildConfigHash,
+};
diff --git a/server/services/tuya/lib/utils/tuya.constants.js b/server/services/tuya/lib/utils/tuya.constants.js
index 2a541646a1..be8650589f 100644
--- a/server/services/tuya/lib/utils/tuya.constants.js
+++ b/server/services/tuya/lib/utils/tuya.constants.js
@@ -7,6 +7,7 @@ const GLADYS_VARIABLES = {
   APP_ACCOUNT_UID: 'TUYA_APP_ACCOUNT_UID',
   APP_USERNAME: 'TUYA_APP_USERNAME',
   MANUAL_DISCONNECT: 'TUYA_MANUAL_DISCONNECT',
+  LAST_CONNECTED_CONFIG_HASH: 'TUYA_LAST_CONNECTED_CONFIG_HASH',
 };
 
 const TUYA_ENDPOINTS = {
diff --git a/server/test/services/tuya/index.test.js b/server/test/services/tuya/index.test.js
index acf0e6e8de..922b6e3750 100644
--- a/server/test/services/tuya/index.test.js
+++ b/server/test/services/tuya/index.test.js
@@ -72,7 +72,8 @@ describe('TuyaService', () => {
     tuyaService.device.connect = fake.resolves();
 
     await tuyaService.start();
-    tuyaService.device.status = STATUS.DISCONNECTED;
+    tuyaService.device.status = STATUS.ERROR;
+    tuyaService.device.autoReconnectAllowed = true;
 
     await intervalCallback();
 
@@ -87,7 +88,8 @@ describe('TuyaService', () => {
     tuyaService.device.connect = fake.resolves();
 
     await tuyaService.start();
-    tuyaService.device.status = STATUS.DISCONNECTED;
+    tuyaService.device.status = STATUS.ERROR;
+    tuyaService.device.autoReconnectAllowed = true;
 
     await intervalCallback();
 
@@ -103,6 +105,7 @@ describe('TuyaService', () => {
 
     await tuyaService.start();
     tuyaService.device.status = STATUS.CONNECTING;
+    tuyaService.device.autoReconnectAllowed = true;
 
     await intervalCallback();
 
@@ -117,6 +120,8 @@ describe('TuyaService', () => {
     tuyaService.device.connect = fake.resolves();
 
     await tuyaService.start();
+    tuyaService.device.status = STATUS.ERROR;
+    tuyaService.device.autoReconnectAllowed = true;
 
     await intervalCallback();
 
diff --git a/server/test/services/tuya/lib/tuya.connect.test.js b/server/test/services/tuya/lib/tuya.connect.test.js
index 2dddd5a924..e0d125f8e4 100644
--- a/server/test/services/tuya/lib/tuya.connect.test.js
+++ b/server/test/services/tuya/lib/tuya.connect.test.js
@@ -96,13 +96,20 @@ describe('TuyaHandler.connect', () => {
       baseUrl: 'apiUrl',
       accessKey: 'accessKey',
       secretKey: 'secretKey',
+      appAccountId: 'appAccountId',
     });
 
     expect(tuyaHandler.status).to.eq(STATUS.CONNECTED);
 
     assert.calledOnce(client.init);
-    assert.calledOnce(gladys.variable.setValue);
-    assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, false, serviceId);
+    assert.calledTwice(gladys.variable.setValue);
+    assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, 'false', serviceId);
+    assert.calledWith(
+      gladys.variable.setValue,
+      GLADYS_VARIABLES.LAST_CONNECTED_CONFIG_HASH,
+      sinon.match.string,
+      serviceId,
+    );
 
     assert.callCount(gladys.event.emit, 2);
     assert.calledWith(gladys.event.emit, EVENTS.WEBSOCKET.SEND_ALL, {
@@ -122,6 +129,7 @@ describe('TuyaHandler.connect', () => {
       baseUrl: 'apiUrl',
       accessKey: 'accessKey',
       secretKey: 'secretKey',
+      appAccountId: 'appAccountId',
     });
 
     expect(tuyaHandler.status).to.eq(STATUS.ERROR);
diff --git a/server/test/services/tuya/lib/tuya.getConfiguration.test.js b/server/test/services/tuya/lib/tuya.getConfiguration.test.js
index 7eda1c40cd..cea8773a18 100644
--- a/server/test/services/tuya/lib/tuya.getConfiguration.test.js
+++ b/server/test/services/tuya/lib/tuya.getConfiguration.test.js
@@ -32,6 +32,8 @@ describe('TuyaHandler.getConfiguration', () => {
       .returns('accessKey')
       .withArgs(GLADYS_VARIABLES.SECRET_KEY, serviceId)
       .returns('secretKey')
+      .withArgs(GLADYS_VARIABLES.APP_ACCOUNT_UID, serviceId)
+      .returns('appAccountId')
       .withArgs(GLADYS_VARIABLES.APP_USERNAME, serviceId)
       .returns('user@example.com');
 
@@ -42,12 +44,15 @@ describe('TuyaHandler.getConfiguration', () => {
       accessKey: 'accessKey',
       secretKey: 'secretKey',
       appUsername: 'user@example.com',
+      endpoint: 'easternAmerica',
+      appAccountId: 'appAccountId',
     });
 
-    assert.callCount(gladys.variable.getValue, 4);
+    assert.callCount(gladys.variable.getValue, 5);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ENDPOINT, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ACCESS_KEY, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.SECRET_KEY, serviceId);
+    assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.APP_ACCOUNT_UID, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.APP_USERNAME, serviceId);
   });
 });
diff --git a/server/test/services/tuya/lib/tuya.getStatus.test.js b/server/test/services/tuya/lib/tuya.getStatus.test.js
index 43859684e7..2d5c2961c9 100644
--- a/server/test/services/tuya/lib/tuya.getStatus.test.js
+++ b/server/test/services/tuya/lib/tuya.getStatus.test.js
@@ -32,6 +32,8 @@ describe('TuyaHandler.getStatus', () => {
       .returns('accessKey')
       .withArgs(GLADYS_VARIABLES.SECRET_KEY, serviceId)
       .returns('secretKey')
+      .withArgs(GLADYS_VARIABLES.APP_ACCOUNT_UID, serviceId)
+      .returns('appAccountId')
       .withArgs(GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId)
       .returns(null);
 
@@ -51,6 +53,7 @@ describe('TuyaHandler.getStatus', () => {
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ENDPOINT, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ACCESS_KEY, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.SECRET_KEY, serviceId);
+    assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.APP_ACCOUNT_UID, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId);
   });
 
@@ -62,6 +65,8 @@ describe('TuyaHandler.getStatus', () => {
       .returns('accessKey')
       .withArgs(GLADYS_VARIABLES.SECRET_KEY, serviceId)
       .returns('secretKey')
+      .withArgs(GLADYS_VARIABLES.APP_ACCOUNT_UID, serviceId)
+      .returns('appAccountId')
       .withArgs(GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId)
       .returns('1');
 
diff --git a/server/test/services/tuya/lib/tuya.init.test.js b/server/test/services/tuya/lib/tuya.init.test.js
index 460ed75c3f..adb241841e 100644
--- a/server/test/services/tuya/lib/tuya.init.test.js
+++ b/server/test/services/tuya/lib/tuya.init.test.js
@@ -45,8 +45,12 @@ describe('TuyaHandler.init', () => {
       .returns('accessKey')
       .withArgs(GLADYS_VARIABLES.SECRET_KEY, serviceId)
       .returns('secretKey')
+      .withArgs(GLADYS_VARIABLES.APP_ACCOUNT_UID, serviceId)
+      .returns('appAccountId')
       .withArgs(GLADYS_VARIABLES.APP_USERNAME, serviceId)
       .returns('appUsername')
+      .withArgs(GLADYS_VARIABLES.LAST_CONNECTED_CONFIG_HASH, serviceId)
+      .returns(null)
       .withArgs(GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId)
       .returns(null);
 
@@ -54,11 +58,13 @@ describe('TuyaHandler.init', () => {
 
     expect(tuyaHandler.status).to.eq(STATUS.CONNECTED);
 
-    assert.callCount(gladys.variable.getValue, 5);
+    assert.callCount(gladys.variable.getValue, 7);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ENDPOINT, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.ACCESS_KEY, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.SECRET_KEY, serviceId);
+    assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.APP_ACCOUNT_UID, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.APP_USERNAME, serviceId);
+    assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.LAST_CONNECTED_CONFIG_HASH, serviceId);
     assert.calledWith(gladys.variable.getValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId);
 
     assert.calledOnce(client.init);
@@ -82,8 +88,12 @@ describe('TuyaHandler.init', () => {
       .returns('accessKey')
       .withArgs(GLADYS_VARIABLES.SECRET_KEY, serviceId)
       .returns('secretKey')
+      .withArgs(GLADYS_VARIABLES.APP_ACCOUNT_UID, serviceId)
+      .returns('appAccountId')
       .withArgs(GLADYS_VARIABLES.APP_USERNAME, serviceId)
       .returns('appUsername')
+      .withArgs(GLADYS_VARIABLES.LAST_CONNECTED_CONFIG_HASH, serviceId)
+      .returns(null)
       .withArgs(GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId)
       .returns('1');
 
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index 30e2de095f..b152e4ddfe 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -192,8 +192,13 @@ describe('TuyaHandler.localScan', () => {
     const clock = sinon.useFakeTimers();
     const promise = localScan(1);
     await clock.tickAsync(1100);
-    await promise;
+    const result = await promise;
     clock.restore();
+
+    expect(result).to.deep.equal({
+      devices: {},
+      portErrors: {},
+    });
   });
 
   it('should log listening address when available', async () => {
diff --git a/server/test/services/tuya/lib/tuya.saveConfiguration.test.js b/server/test/services/tuya/lib/tuya.saveConfiguration.test.js
index 19e8105dc2..0ec30ff22d 100644
--- a/server/test/services/tuya/lib/tuya.saveConfiguration.test.js
+++ b/server/test/services/tuya/lib/tuya.saveConfiguration.test.js
@@ -37,12 +37,13 @@ describe('TuyaHandler.saveConfiguration', () => {
 
     expect(config).to.deep.eq(configuration);
 
-    assert.callCount(gladys.variable.setValue, 6);
+    assert.callCount(gladys.variable.setValue, 7);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.ENDPOINT, 'endpoint', serviceId);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.ACCESS_KEY, 'accessKey', serviceId);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.SECRET_KEY, 'secretKey', serviceId);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.APP_ACCOUNT_UID, 'appAccountUID', serviceId);
     assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.APP_USERNAME, 'user@example.com', serviceId);
-    assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, false, serviceId);
+    assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, 'false', serviceId);
+    assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.LAST_CONNECTED_CONFIG_HASH, '', serviceId);
   });
 });
diff --git a/server/test/services/tuya/tuya.mock.test.js b/server/test/services/tuya/tuya.mock.test.js
index e8e0c4071f..fc1515318c 100644
--- a/server/test/services/tuya/tuya.mock.test.js
+++ b/server/test/services/tuya/tuya.mock.test.js
@@ -6,6 +6,7 @@ const client = {
 
 const TuyaContext = function TuyaContext() {
   this.client = client;
+  this.request = sinon.stub().resolves({ result: { list: [] }, success: true });
 };
 
 module.exports = {

From 1f07038a53fe8020524c946f63cb45338be641a0 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 21 Feb 2026 19:14:06 +0100
Subject: [PATCH 29/90] =?UTF-8?q?feat(tuya):=20am=C3=A9liorer=20la=20gesti?=
 =?UTF-8?q?on=20de=20la=20configuration=20Tuya=20en=20ajoutant=20la=20v?=
 =?UTF-8?q?=C3=A9rification=20de=20l'UID=20du=20compte=20d'application=20e?=
 =?UTF-8?q?t=20en=20renfor=C3=A7ant=20les=20tests=20associ=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../all/tuya/setup-page/SetupTab.jsx          |  11 +-
 server/services/tuya/lib/tuya.loadDevices.js  |   7 +-
 server/test/services/tuya/index.test.js       |  80 ++++++++++++++
 .../services/tuya/lib/tuya.connect.test.js    | 101 ++++++++++++++++++
 .../tuya/lib/tuya.loadDevices.test.js         |  43 ++++++++
 5 files changed, 237 insertions(+), 5 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 5bd97fbb2e..5a9377b5cd 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -76,7 +76,7 @@ class SetupTab extends Component {
         tuyaSecretKey,
         tuyaAppAccountId,
         tuyaAppUsername,
-        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey)
+        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId)
       });
     } catch (e) {
       this.setState({
@@ -86,7 +86,7 @@ class SetupTab extends Component {
         tuyaSecretKey,
         tuyaAppAccountId,
         tuyaAppUsername,
-        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey)
+        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId)
       });
     }
   }
@@ -286,7 +286,12 @@ class SetupTab extends Component {
     const { name, value } = e.target;
     this.setState(prevState => {
       const nextState = { ...prevState, [name]: value };
-      const configured = !!(nextState.tuyaEndpoint && nextState.tuyaAccessKey && nextState.tuyaSecretKey);
+      const configured = !!(
+        nextState.tuyaEndpoint &&
+        nextState.tuyaAccessKey &&
+        nextState.tuyaSecretKey &&
+        nextState.tuyaAppAccountId
+      );
       return {
         [name]: value,
         tuyaConfigured: configured
diff --git a/server/services/tuya/lib/tuya.loadDevices.js b/server/services/tuya/lib/tuya.loadDevices.js
index bfc3364308..5499583fa0 100644
--- a/server/services/tuya/lib/tuya.loadDevices.js
+++ b/server/services/tuya/lib/tuya.loadDevices.js
@@ -26,7 +26,10 @@ async function loadDevices(pageNo = 1, pageSize = 100) {
       page_size: pageSize,
     },
   });
-  if (responsePage && responsePage.success === false) {
+  if (!responsePage) {
+    throw new Error('Tuya API returned no response');
+  }
+  if (responsePage.success === false) {
     const message = responsePage.msg || responsePage.message || responsePage.code || 'Tuya API error';
     throw new Error(message);
   }
@@ -40,7 +43,7 @@ async function loadDevices(pageNo = 1, pageSize = 100) {
 
   if (hasMore) {
     const nextResult = await this.loadDevices(pageNo + 1, pageSize);
-    nextResult.forEach((device) => list.push(device));
+    list.push(...nextResult);
   }
 
   logger.debug(`${list.length} Tuya devices loaded`);
diff --git a/server/test/services/tuya/index.test.js b/server/test/services/tuya/index.test.js
index 922b6e3750..18851c3855 100644
--- a/server/test/services/tuya/index.test.js
+++ b/server/test/services/tuya/index.test.js
@@ -98,6 +98,22 @@ describe('TuyaService', () => {
     assert.notCalled(tuyaService.device.connect);
   });
 
+  it('should not auto-reconnect when autoReconnectAllowed is false', async () => {
+    tuyaService.device.getStatus = fake.resolves({ configured: true, manual_disconnect: false });
+    tuyaService.device.getConfiguration = fake.resolves({ config: 'ok' });
+    tuyaService.device.connect = fake.resolves();
+
+    await tuyaService.start();
+    tuyaService.device.status = STATUS.ERROR;
+    tuyaService.device.autoReconnectAllowed = false;
+
+    await intervalCallback();
+
+    assert.notCalled(tuyaService.device.getStatus);
+    assert.notCalled(tuyaService.device.getConfiguration);
+    assert.notCalled(tuyaService.device.connect);
+  });
+
   it('should not auto-reconnect when already connecting', async () => {
     tuyaService.device.getStatus = fake.resolves({ configured: true, manual_disconnect: false });
     tuyaService.device.getConfiguration = fake.resolves({ config: 'ok' });
@@ -114,6 +130,70 @@ describe('TuyaService', () => {
     assert.notCalled(tuyaService.device.connect);
   });
 
+  it('should schedule quick reconnects on start when disconnected and allowed', async () => {
+    tuyaService.device.init = fake(function init() {
+      this.status = STATUS.ERROR;
+      this.autoReconnectAllowed = true;
+    });
+    tuyaService.device.getStatus = fake.resolves({ configured: false, manual_disconnect: false });
+
+    await tuyaService.start();
+
+    assert.calledOnce(tuyaService.device.getStatus);
+    assert.notCalled(tuyaService.device.loadDevices);
+  });
+
+  it('should skip quick reconnect when already in progress', async () => {
+    let resolveStatus;
+    const pendingStatus = new Promise((resolve) => {
+      resolveStatus = resolve;
+    });
+
+    tuyaService.device.getStatus = fake.returns(pendingStatus);
+    tuyaService.device.getConfiguration = fake.resolves({ config: 'ok' });
+    tuyaService.device.connect = fake.resolves();
+
+    await tuyaService.start();
+    tuyaService.device.status = STATUS.ERROR;
+    tuyaService.device.autoReconnectAllowed = true;
+
+    const firstCall = intervalCallback();
+    await intervalCallback();
+
+    assert.calledOnce(tuyaService.device.getStatus);
+
+    resolveStatus({ configured: false, manual_disconnect: false });
+    await firstCall;
+  });
+
+  it('should clear pending quick reconnect timeouts', async () => {
+    const setTimeoutStub = sinon.stub(global, 'setTimeout').callsFake(() => 456);
+    const clearTimeoutStub = sinon.stub(global, 'clearTimeout');
+
+    try {
+      tuyaService.device.init = fake(function init() {
+        this.status = STATUS.CONNECTED;
+        this.autoReconnectAllowed = true;
+      });
+      tuyaService.device.getStatus = fake.resolves({ configured: true, manual_disconnect: false });
+      tuyaService.device.getConfiguration = fake.resolves({ config: 'ok' });
+      tuyaService.device.connect = fake.resolves();
+
+      await tuyaService.start();
+      tuyaService.device.status = STATUS.ERROR;
+      tuyaService.device.autoReconnectAllowed = true;
+
+      await intervalCallback();
+      await tuyaService.stop();
+
+      assert.calledOnce(setTimeoutStub);
+      assert.calledWith(clearTimeoutStub, 456);
+    } finally {
+      setTimeoutStub.restore();
+      clearTimeoutStub.restore();
+    }
+  });
+
   it('should handle auto-reconnect errors', async () => {
     tuyaService.device.getStatus = fake.rejects(new Error('status failure'));
     tuyaService.device.getConfiguration = fake.resolves({ config: 'ok' });
diff --git a/server/test/services/tuya/lib/tuya.connect.test.js b/server/test/services/tuya/lib/tuya.connect.test.js
index e0d125f8e4..f124615ce3 100644
--- a/server/test/services/tuya/lib/tuya.connect.test.js
+++ b/server/test/services/tuya/lib/tuya.connect.test.js
@@ -151,4 +151,105 @@ describe('TuyaHandler.connect', () => {
       payload: { status: STATUS.ERROR, error: 'Error' },
     });
   });
+
+  it('should map invalid client id error', async () => {
+    client.init.rejects(new Error('GET_TOKEN_FAILED 2009, clientId is invalid'));
+    tuyaHandler.autoReconnectAllowed = true;
+
+    await tuyaHandler.connect({
+      baseUrl: 'apiUrl',
+      accessKey: 'accessKey',
+      secretKey: 'secretKey',
+      appAccountId: 'appAccountId',
+    });
+
+    expect(tuyaHandler.status).to.eq(STATUS.ERROR);
+    expect(tuyaHandler.lastError).to.eq('integration.tuya.setup.errorInvalidClientId');
+    expect(tuyaHandler.autoReconnectAllowed).to.equal(false);
+  });
+
+  it('should map invalid client secret error', async () => {
+    client.init.rejects(new Error('GET_TOKEN_FAILED 1004, sign invalid'));
+    tuyaHandler.autoReconnectAllowed = true;
+
+    await tuyaHandler.connect({
+      baseUrl: 'apiUrl',
+      accessKey: 'accessKey',
+      secretKey: 'secretKey',
+      appAccountId: 'appAccountId',
+    });
+
+    expect(tuyaHandler.status).to.eq(STATUS.ERROR);
+    expect(tuyaHandler.lastError).to.eq('integration.tuya.setup.errorInvalidClientSecret');
+    expect(tuyaHandler.autoReconnectAllowed).to.equal(false);
+  });
+
+  it('should map invalid endpoint error', async () => {
+    client.init.rejects(new Error('No permission. The data center is suspended.'));
+    tuyaHandler.autoReconnectAllowed = true;
+
+    await tuyaHandler.connect({
+      baseUrl: 'apiUrl',
+      accessKey: 'accessKey',
+      secretKey: 'secretKey',
+      appAccountId: 'appAccountId',
+    });
+
+    expect(tuyaHandler.status).to.eq(STATUS.ERROR);
+    expect(tuyaHandler.lastError).to.eq('integration.tuya.setup.errorInvalidEndpoint');
+    expect(tuyaHandler.autoReconnectAllowed).to.equal(false);
+  });
+
+  it('should map missing app account uid error', async () => {
+    client.init.resolves();
+    tuyaHandler.autoReconnectAllowed = true;
+
+    await tuyaHandler.connect({
+      baseUrl: 'apiUrl',
+      accessKey: 'accessKey',
+      secretKey: 'secretKey',
+      appAccountId: '',
+    });
+
+    expect(tuyaHandler.status).to.eq(STATUS.ERROR);
+    expect(tuyaHandler.lastError).to.eq('integration.tuya.setup.errorInvalidAppAccountUid');
+    expect(tuyaHandler.autoReconnectAllowed).to.equal(false);
+    assert.notCalled(tuyaHandler.connector.request);
+  });
+
+  it('should map invalid app account uid from api response', async () => {
+    const clientStub = {
+      init: sinon.stub().resolves(),
+    };
+    const requestStub = sinon.stub().resolves({
+      success: false,
+      msg: 'permission deny',
+      code: 1106,
+    });
+    const TuyaContextStub = function TuyaContextStub() {
+      this.client = clientStub;
+      this.request = requestStub;
+    };
+
+    const connectWithStub = proxyquire('../../../../services/tuya/lib/tuya.connect', {
+      '@tuya/tuya-connector-nodejs': { TuyaContext: TuyaContextStub },
+    });
+    const TuyaHandlerWithStub = proxyquire('../../../../services/tuya/lib/index', {
+      './tuya.connect.js': connectWithStub,
+    });
+    const handler = new TuyaHandlerWithStub(gladys, serviceId);
+    handler.autoReconnectAllowed = true;
+
+    await handler.connect({
+      baseUrl: 'apiUrl',
+      accessKey: 'accessKey',
+      secretKey: 'secretKey',
+      appAccountId: 'appAccountId',
+    });
+
+    expect(handler.status).to.eq(STATUS.ERROR);
+    expect(handler.lastError).to.eq('integration.tuya.setup.errorInvalidAppAccountUid');
+    expect(handler.autoReconnectAllowed).to.equal(false);
+    assert.calledOnce(requestStub);
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.loadDevices.test.js b/server/test/services/tuya/lib/tuya.loadDevices.test.js
index f2d34d5eb9..e3bd4d70ee 100644
--- a/server/test/services/tuya/lib/tuya.loadDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDevices.test.js
@@ -63,4 +63,47 @@ describe('TuyaHandler.loadDevices', () => {
     expect(devices).to.deep.eq([{ id: 1 }]);
     assert.callCount(tuyaHandler.connector.request, 2);
   });
+
+  it('should throw on invalid pageNo', async () => {
+    try {
+      await tuyaHandler.loadDevices(0, 1);
+      assert.fail();
+    } catch (e) {
+      expect(e.message).to.equal('pageNo must be a positive integer');
+    }
+  });
+
+  it('should throw on invalid pageSize', async () => {
+    try {
+      await tuyaHandler.loadDevices(1, 0);
+      assert.fail();
+    } catch (e) {
+      expect(e.message).to.equal('pageSize must be a positive integer');
+    }
+  });
+
+  it('should throw on api error response', async () => {
+    tuyaHandler.connector.request = sinon.stub().resolves({
+      success: false,
+      msg: 'Tuya error',
+    });
+
+    try {
+      await tuyaHandler.loadDevices(1, 1);
+      assert.fail();
+    } catch (e) {
+      expect(e.message).to.equal('Tuya error');
+    }
+  });
+
+  it('should throw on empty api response', async () => {
+    tuyaHandler.connector.request = sinon.stub().resolves(null);
+
+    try {
+      await tuyaHandler.loadDevices(1, 1);
+      assert.fail();
+    } catch (e) {
+      expect(e.message).to.equal('Tuya API returned no response');
+    }
+  });
 });

From 021176d21183b0f290a78573b58bd9e740585d38 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 21 Feb 2026 19:31:51 +0100
Subject: [PATCH 30/90] =?UTF-8?q?feat(tuya):=20optimiser=20la=20r=C3=A9cup?=
 =?UTF-8?q?=C3=A9ration=20des=20param=C3=A8tres=20Tuya=20en=20utilisant=20?=
 =?UTF-8?q?Promise.all=20et=20am=C3=A9liorer=20la=20gestion=20des=20erreur?=
 =?UTF-8?q?s=20de=20sauvegarde?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../integration/all/tuya/setup-page/SetupTab.jsx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 5a9377b5cd..f20049c418 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -63,11 +63,13 @@ class SetupTab extends Component {
     };
 
     try {
-      tuyaEndpoint = await getVariable('TUYA_ENDPOINT');
-      tuyaAccessKey = await getVariable('TUYA_ACCESS_KEY');
-      tuyaSecretKey = await getVariable('TUYA_SECRET_KEY');
-      tuyaAppAccountId = await getVariable('TUYA_APP_ACCOUNT_UID');
-      tuyaAppUsername = await getVariable('TUYA_APP_USERNAME');
+      [tuyaEndpoint, tuyaAccessKey, tuyaSecretKey, tuyaAppAccountId, tuyaAppUsername] = await Promise.all([
+        getVariable('TUYA_ENDPOINT'),
+        getVariable('TUYA_ACCESS_KEY'),
+        getVariable('TUYA_SECRET_KEY'),
+        getVariable('TUYA_APP_ACCOUNT_UID'),
+        getVariable('TUYA_APP_USERNAME')
+      ]);
 
       this.setState({
         tuyaGetSettingsStatus: RequestStatus.Success,
@@ -202,7 +204,9 @@ class SetupTab extends Component {
         (e && e.message && e.message !== 'TUYA_START_ERROR' ? e.message : null);
       this.setState({
         tuyaSaveSettingsStatus: RequestStatus.Error,
-        tuyaConnectionError: responseMessage
+        tuyaConnectionError: responseMessage,
+        tuyaJustSaved: false,
+        tuyaJustSavedMissing: false
       });
     }
   };

From 01700bb582318d57a60164397ca5026eed51fcc6 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Thu, 26 Feb 2026 18:50:41 +0100
Subject: [PATCH 31/90] feat(tuya): finalize v2 local baseline ux and local
 discovery updates

---
 front/src/config/i18n/de.json                 |  23 ++-
 front/src/config/i18n/en.json                 |  23 ++-
 front/src/config/i18n/fr.json                 |  33 ++--
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 108 ++++++-----
 .../all/tuya/device-page/DeviceTab.jsx        |   3 +
 .../all/tuya/discover-page/DiscoverTab.jsx    |  33 +++-
 .../all/tuya/setup-page/SetupTab.jsx          |   7 +
 .../tuya/lib/device/tuya.convertDevice.js     |   5 +
 .../tuya/lib/tuya.loadDeviceDetails.js        |  46 ++++-
 server/services/tuya/lib/tuya.localScan.js    |  56 ++++--
 .../services/tuya/lib/utils/tuya.constants.js |   1 +
 .../lib/controllers/tuya.controller.test.js   |  10 +-
 .../lib/device/tuya.convertDevice.test.js     |  11 ++
 .../tuya/lib/tuya.discoverDevices.test.js     |  45 ++++-
 .../tuya/lib/tuya.loadDeviceDetails.test.js   | 175 +++++++++++++++++-
 .../services/tuya/lib/tuya.localScan.test.js  |  28 +++
 16 files changed, 487 insertions(+), 120 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 93133aa6af..ca6f474364 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1197,6 +1197,7 @@
       "alreadyCreatedButton": "Bereits erstellt",
       "deleteButton": "Löschen",
       "unmanagedModelButton": "Modell nicht verwaltet oder verfügbar",
+      "localModeLimitInfo": "Der lokale Modus wird noch verbessert. Bei manchen Geräten können Befehle oder Status-Updates weiterhin über die Tuya-Cloud laufen, auch wenn der lokale Modus aktiviert ist.",
       "status": {
         "notConnected": "Gladys konnte keine Verbindung zum Tuya-Cloud-Account herstellen. Bitte gehe zur ",
         "setupPageLink": "Tuya-Einrichtungsseite.",
@@ -1212,6 +1213,8 @@
         "idLabel": "Geräte-ID",
         "localKeyLabel": "Lokaler Schlüssel",
         "protocolVersionLabel": "Protokollversion",
+        "protocol35OptionUnsupported": "3.5 (Nicht unterstützt)",
+        "protocol35Unsupported": "Das Tuya-Protokoll 3.5 wird lokal noch nicht unterstützt. Bitte nutze den Cloud-Modus oder 3.1/3.3/3.4.",
         "ipAddressLabel": "IP-Adresse",
         "ipModeLocal": "Lokal",
         "ipModeCloud": "Cloud",
@@ -1222,15 +1225,13 @@
         "localPollRequired": "Lokaler Modus ist aktiv und lokale Einstellungen wurden geändert. Bitte \"Lokales DPS abfragen\" erfolgreich ausführen, bevor du speicherst. Wenn der lokale Modus nicht funktioniert, schalte zurück in den Cloud-Modus.",
         "localPollSuccess": "Lokaler Poll OK.",
         "localPollError": "Lokaler Poll fehlgeschlagen:",
-        "createGithubIssue": "Dieses Gerät vorschlagen",
-        "githubIssueInfo": "Ein Bericht wird mit den Gerätedetails gesendet. Sensible Daten (Lokaler Schlüssel und IP-Adresse) werden maskiert.",
         "productIdLabel": "Produkt-ID",
         "productKeyLabel": "Produktschlüssel"
       },
       "discover": {
         "title": "In deinem Tuya-Cloud-Account erkannte Geräte",
         "description": "Tuya-Geräte werden automatisch erkannt. Deine Tuya-Geräte müssen zuerst zu deinem Tuya-Cloud-Account hinzugefügt werden.",
-        "localDiscoveryInfo": "Lokale Erkennung nutzt UDP-Broadcast. Starte den lokalen UDP-Scan und gib bei Bedarf lokale IP und Protokollversion ein und nutze \"Lokales DPS abfragen\".",
+        "localDiscoveryInfo": "<strong class=\"h5 d-block\">Cloud-Scan</strong>Aktualisiert die Cloud-Liste. Stelle sicher, dass deine Geräte in Tuya als <strong>steuerbar</strong> gesetzt sind, sonst bleiben sie <strong>schreibgeschützt</strong>. Die Testphase ist auf <strong>10 steuerbare Geräte</strong> begrenzt; zusätzliche Geräte liefern ggf. nur <strong>Statusrückmeldungen</strong>.<br /><br /><strong class=\"h5 d-block\">Lokaler Auto-Scan</strong>Startet einen Scan in deinem lokalen Netzwerk (UDP-Broadcast, gleiches Subnetz wie Gladys). Wenn ein Gerät nicht gefunden wird, trage die <strong>lokale IP</strong> und die <strong>Protokollversion</strong> ein (oder lasse es leer, wenn unbekannt) und nutze \"<strong>Lokales DPS abfragen</strong>\", um die lokale Kommunikation zu prüfen.<br /><br />Nutze <strong>Sichern</strong>, um ein Gerät zu erstellen, und <strong>Aktualisieren</strong>, um Änderungen zu übernehmen oder auf lokalen Modus umzuschalten.",
         "scanCloudInProgress": "Scan läuft... Cloud-Geräte werden abgerufen. Das kann etwas dauern.",
         "scanLocalInProgressConnected": "Scan läuft... Lokale Informationen der Geräte werden abgerufen. Das kann etwas dauern.",
         "scanLocalInProgressDisconnected": "Scan läuft... Lokale Geräte werden abgerufen. Das kann etwas dauern.",
@@ -1248,12 +1249,16 @@
         "description": "Du kannst Gladys mit deinem Tuya-Cloud-Account verbinden, um die zugehörigen Geräte zu steuern. Die Dokumentation findest du im linken Menü oder <a href=\"https://gladysassistant.com/de/docs/integrations/tuya\" target=\"_blank\" rel=\"noopener noreferrer\">hier</a>.",
         "descriptionCreateAccount": "Du musst einen Account bei <a href=\"https://www.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya</a> erstellen (<a href=\"https://auth.tuya.com/register\" target=\"_blank\" rel=\"noopener noreferrer\">Registrieren</a> / <a href=\"https://auth.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Anmelden</a>).",
         "descriptionCreateProject": "Danach musst du ein \"Cloud-Projekt\" in deinem Tuya-Account erstellen (Konsole: <a href=\"https://platform.tuya.com/cloud\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Platform</a>).",
-        "descriptionGetKeys": "Du erhältst Zugang zur Client ID und zum Client Secret.",
-        "descriptionGetAppAccountUid": "Um deine \"App Account UID\" zu erhalten, musst du zum Abschnitt \"Geräte\" -> \"Tuya App-Account verknüpfen\" gehen und einen Anwendungsaccount hinzufügen.",
-        "descriptionGetAppAccountUid2": "Sobald das Hinzufügen abgeschlossen ist, findest du deine \"App Account UID\" in der UID-Spalte.",
-        "descriptionTrial": "Tuya-Cloud-Projekte haben eine Testphase: verlängere sie regelmäßig, um Unterbrechungen zu vermeiden.",
+        "descriptionGetKeys": "Du erhältst Zugriff auf beide Schlüssel: <strong>Client ID</strong> und <strong>Client Secret</strong>.",
+        "descriptionGetAppAccountUid": "Um deine <strong>App Account UID</strong> zu erhalten, gehe zu \"Geräte\" -> \"Tuya App-Account verknüpfen\" und füge einen App-Account hinzu.",
+        "descriptionGetAppAccountUid2": "Sobald die Verknüpfung abgeschlossen ist, steht deine <strong>App Account UID</strong> in der UID-Spalte.",
+        "descriptionTrial": "Tuya-Cloud-Projekte haben eine <strong>Testphase</strong>: denke daran, sie regelmäßig zu <strong>verlängern</strong>, um Unterbrechungen zu vermeiden.",
+        "descriptionCloudLimit": "Hinweis: Die Tuya-Cloud-Testversion erlaubt bis zu <strong>10 steuerbare Geräte</strong>. Weitere Geräte können <strong>schreibgeschützt</strong> bleiben, bis du ein Upgrade durchführst.",
+        "descriptionControllable": "Einige Geräte sind standardmäßig <strong>schreibgeschützt</strong>. Öffne in der Tuya IoT Platform <strong>Device Permission</strong> und klicke auf <strong>Change</strong>, um sie steuerbar zu machen.",
         "localTitle": "<br /><strong>Lokal</strong><br />",
         "descriptionLocalMode": "Der lokale Modus kann nach der Cloud-Konfiguration genutzt werden: Trage lokale IP und Protokollversion pro Gerät ein, um lokal abzufragen. Wenn die Geräte im selben Netzwerk wie der Gladys-Host sind, werden IP-Erkennung und Protokollversion automatisch erkannt. So kannst du die Cloud-Verlängerung umgehen, aber für das Hinzufügen neuer Geräte in der Tuya-App bleibt die Cloud nötig.",
+        "descriptionLocalKeepsApp": "<strong>Lokale Steuerung</strong> deaktiviert die Steuerung über die Tuya/Smart-Life-App nicht.",
+        "descriptionCameraLimit": "<strong>Kameras</strong>: Video-Streaming wird in Gladys derzeit nicht unterstützt.",
         "endpoints": {
           "china": "China",
           "westernAmerica": "Westamerika",
@@ -3400,7 +3405,6 @@
     "category": {
       "button": {
         "click": {
-          "unknown": "{{value}} (unbekannter Wert)",
           "1": "Einfacher Klick",
           "2": "Doppelter Klick",
           "3": "Langer Klick (drücken)",
@@ -3484,7 +3488,8 @@
           "81": "Halten Minus",
           "82": "Loslassen Plus",
           "83": "Loslassen Mitte",
-          "84": "Loslassen Minus"
+          "84": "Loslassen Minus",
+          "unknown": "{{value}} (unbekannter Wert)"
         }
       },
       "heater": {
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index 4ca026add9..f8fc125ba1 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1092,6 +1092,7 @@
       "alreadyCreatedButton": "Already created",
       "deleteButton": "Delete",
       "unmanagedModelButton": "Model not managed or available",
+      "localModeLimitInfo": "Local mode is still being improved. For some devices, commands or state updates may still use Tuya cloud even if Local mode is selected.",
       "status": {
         "notConnected": "Gladys failed to connect to Tuya cloud account, please go to ",
         "setupPageLink": "Tuya configuration page.",
@@ -1107,6 +1108,8 @@
         "idLabel": "Device ID",
         "localKeyLabel": "Local Key",
         "protocolVersionLabel": "Protocol Version",
+        "protocol35OptionUnsupported": "3.5 (Not supported)",
+        "protocol35Unsupported": "Tuya protocol 3.5 is not supported locally yet. Please use cloud mode or protocol 3.1/3.3/3.4.",
         "ipAddressLabel": "IP Address",
         "ipModeLocal": "Local",
         "ipModeCloud": "Cloud",
@@ -1117,15 +1120,13 @@
         "localPollRequired": "Local mode is enabled and local settings changed. Run \"Poll local DPS\" successfully before saving. If local mode doesn't work, switch back to cloud mode.",
         "localPollSuccess": "Local poll OK.",
         "localPollError": "Local poll failed:",
-        "createGithubIssue": "Suggest this device",
-        "githubIssueInfo": "A report will be sent with the device details. Sensitive data (local key and IP) is masked.",
         "productIdLabel": "Product ID",
         "productKeyLabel": "Product Key"
       },
       "discover": {
         "title": "Devices detected on your Tuya cloud account",
         "description": "Tuya devices are automatically discovered. Your Tuya devices need to be added to your Tuya cloud account before.",
-        "localDiscoveryInfo": "Local discovery uses UDP broadcast. Run the local UDP scan, then if needed enter the local IP and protocol version and use \"Poll local DPS\".",
+        "localDiscoveryInfo": "<strong class=\"h5 d-block\">Cloud Scan</strong>Refreshes the cloud list. Make sure your devices are set as <strong>controllable</strong> in Tuya, otherwise they stay <strong>read-only</strong>. The cloud trial is limited to <strong>10 controllable devices</strong>; additional devices may only provide <strong>state updates</strong>.<br /><br /><strong class=\"h5 d-block\">Auto local scan</strong>Runs a scan on your local network (UDP broadcast, same subnet as Gladys). If a device is not found, fill in its <strong>local IP</strong> and <strong>protocol version</strong> (or leave empty if unknown), then use \"<strong>Poll local DPS</strong>\" to validate local communication.<br /><br />Use <strong>Save</strong> to create a device and <strong>Update</strong> to apply changes or switch the device to local mode.",
         "scanCloudInProgress": "Scan in progress... retrieving cloud devices. This can take a while.",
         "scanLocalInProgressConnected": "Scan in progress... retrieving local information for devices. This can take a while.",
         "scanLocalInProgressDisconnected": "Scan in progress... retrieving local devices. This can take a while.",
@@ -1143,12 +1144,16 @@
         "description": "You can connect Gladys to your Tuya cloud account to control the related devices. Documentation is available in the left menu or <a href=\"https://gladysassistant.com/en/docs/integrations/tuya\" target=\"_blank\" rel=\"noopener noreferrer\">here</a>.",
         "descriptionCreateAccount": "You need to create an account at <a href=\"https://www.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya</a> (<a href=\"https://auth.tuya.com/register\" target=\"_blank\" rel=\"noopener noreferrer\">Sign up</a> / <a href=\"https://auth.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Log in</a>).",
         "descriptionCreateProject": "You must then create a \"Cloud Project\" in your Tuya account (console: <a href=\"https://platform.tuya.com/cloud\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Platform</a>).",
-        "descriptionGetKeys": "You will have access to the Client ID and the Client Secret.",
-        "descriptionGetAppAccountUid": "To have your \"App account UID\", you must go to the \"Devices\" -> \"Link Tuya App Account\" section and add an application account.",
-        "descriptionGetAppAccountUid2": "Once the addition is finalized, your \"App account UID\" will be in the UID column.",
-        "descriptionTrial": "Tuya Cloud projects have a trial period: make sure to renew or extend it regularly to avoid service interruptions.",
+        "descriptionGetKeys": "You will have access to both keys: <strong>Client ID</strong> and <strong>Client Secret</strong>.",
+        "descriptionGetAppAccountUid": "To get your <strong>App account UID</strong>, go to \"Devices\" -> \"Link Tuya App Account\" and add an application account.",
+        "descriptionGetAppAccountUid2": "Once the account is linked, your <strong>App account UID</strong> appears in the UID column.",
+        "descriptionTrial": "Tuya Cloud projects have a <strong>trial period</strong>: make sure to <strong>renew</strong> or <strong>extend</strong> it regularly to avoid service interruptions.",
+        "descriptionCloudLimit": "Note: the Tuya Cloud trial allows up to <strong>10 controllable devices</strong>. Additional devices may stay <strong>read-only</strong> until you upgrade.",
+        "descriptionControllable": "Some devices are <strong>read-only</strong> by default. In Tuya IoT Platform, open <strong>Device Permission</strong> and click <strong>Change</strong> to make them controllable.",
         "localTitle": "<br /><strong>Local</strong><br />",
         "descriptionLocalMode": "Local mode can be used after the cloud setup: provide the local IP and protocol version on each device to poll locally. If devices are on the same network as the Gladys machine, the IP discovery and protocol version are detected automatically. This lets you avoid renewing the cloud trial, but the cloud is still needed when you add a new device from the Tuya app.",
+        "descriptionLocalKeepsApp": "<strong>Local control</strong> does not disable control from the Tuya/Smart Life app.",
+        "descriptionCameraLimit": "<strong>Cameras</strong>: video streaming is not supported in Gladys yet.",
         "endpoints": {
           "china": "China",
           "westernAmerica": "Western America",
@@ -3400,7 +3405,6 @@
     "category": {
       "button": {
         "click": {
-          "unknown": "{{value}} (unknown value)",
           "1": "Simple click",
           "2": "Double click",
           "3": "Long click press",
@@ -3484,7 +3488,8 @@
           "81": "Hold Minus",
           "82": "Release Plus (Aqara W100)",
           "83": "Release Center (Aqara W100)",
-          "84": "Release Minus (Aqara W100)"
+          "84": "Release Minus (Aqara W100)",
+          "unknown": "{{value}} (unknown value)"
         }
       },
       "heater": {
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index fe2e85c41b..bc75440ef7 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1327,6 +1327,7 @@
       "alreadyCreatedButton": "Déjà créé",
       "deleteButton": "Supprimer",
       "unmanagedModelButton": "Modèle non pris en charge ou non disponible",
+      "localModeLimitInfo": "Le mode local est encore en amélioration. Pour certains appareils, les commandes ou retours d'état peuvent encore passer par le cloud Tuya, même si le mode Local est activé.",
       "status": {
         "notConnected": "Gladys n'a pas réussi à se connecter au compte cloud Tuya, plus d'informations sur la ",
         "setupPageLink": "page de configuration Tuya.",
@@ -1342,25 +1343,25 @@
         "idLabel": "Identifiant de l'appareil",
         "localKeyLabel": "Clé locale",
         "protocolVersionLabel": "Version du protocole",
+        "protocol35OptionUnsupported": "3.5 (Non supporté)",
+        "protocol35Unsupported": "Le protocole Tuya 3.5 n'est pas pris en charge en local pour le moment. Utilisez le mode cloud ou les protocoles 3.1/3.3/3.4.",
         "ipAddressLabel": "Adresse IP",
         "ipModeLocal": "Local",
         "ipModeCloud": "Cloud",
         "localInfoHelp": "Utilisez le bouton Cloud/Local pour choisir le mode de communication. Le mode local permet de modifier l'IP locale. Le mode cloud affiche l'IP cloud (lecture seule).",
-        "localPollButton": "Poll local des DP",
-        "localPollInProgress": "Poll local en cours... protocole {{protocol}}.",
+        "localPollButton": "Lecture locale des DP",
+        "localPollInProgress": "Lecture locale en cours... protocole {{protocol}}.",
         "localPollHelp": "Si vous connaissez le protocole, sélectionnez-le puis cliquez pour vérifier. Sinon, cliquez directement pour un scan complet (plus long).",
-        "localPollRequired": "Le mode local est activé et les paramètres locaux ont changé. Lancez un poll local des DP avec succès avant de sauvegarder. Si vous n'arrivez pas à faire fonctionner le local, repassez en mode cloud.",
-        "localPollSuccess": "Poll local OK.",
-        "localPollError": "Échec du poll local :",
-        "createGithubIssue": "Proposer ce périphérique",
-        "githubIssueInfo": "Un rapport sera envoyé avec les informations du périphérique. Les données sensibles (clé locale et IP) sont masquées.",
+        "localPollRequired": "Le mode local est activé et les paramètres locaux ont changé. Lancez une lecture locale des DP avec succès avant de sauvegarder. Si vous n'arrivez pas à faire fonctionner le local, repassez en mode cloud.",
+        "localPollSuccess": "Lecture locale OK.",
+        "localPollError": "Échec de la lecture locale :",
         "productIdLabel": "Identifiant produit",
         "productKeyLabel": "Clé produit"
       },
       "discover": {
         "title": "Appareils détectés sur votre compte cloud Tuya",
         "description": "Les appareils Tuya sont automatiquement découverts. Vos appareils Tuya doivent être ajoutés à votre compte cloud Tuya avant.",
-        "localDiscoveryInfo": "La découverte locale utilise le broadcast UDP. Lancez le scan UDP local puis, si besoin, renseignez l'IP locale et la version du protocole, et utilisez \"Poll local des DP\".",
+        "localDiscoveryInfo": "<strong class=\"h5 d-block\">Scan Cloud</strong>Rafraîchit la liste cloud. Assurez-vous que vos appareils sont en mode <strong>contrôlable</strong> dans Tuya, sinon ils resteront en <strong>lecture seule</strong>. La période d'essai est limitée à <strong>10 appareils contrôlables</strong> : les autres n'auront que le <strong>retour d'état</strong>.<br /><br /><strong class=\"h5 d-block\">Scan local auto</strong>Lance un scan sur votre réseau local (broadcast UDP, même plage IP que Gladys). Si un appareil n'est pas trouvé, renseignez l'<strong>IP locale</strong> et la <strong>version du protocole</strong> (ou laissez vide si vous ne la connaissez pas), puis utilisez \"<strong>Lecture locale des DP</strong>\" pour valider la communication locale.<br /><br />Utilisez <strong>Sauvegarder</strong> pour créer un appareil et <strong>Mettre à jour</strong> pour appliquer des changements ou passer l'appareil en local.",
         "scanCloudInProgress": "Scan en cours... récupération cloud des appareils. Cela peut prendre un moment.",
         "scanLocalInProgressConnected": "Scan en cours... récupération des informations locales des appareils. Cela peut prendre un moment.",
         "scanLocalInProgressDisconnected": "Scan en cours... récupération des appareils en local. Cela peut prendre un moment.",
@@ -1378,12 +1379,16 @@
         "description": "Vous pouvez connecter Gladys à votre compte cloud Tuya pour commander les appareils associés. La documentation est disponible dans le menu de gauche ou <a href=\"https://gladysassistant.com/fr/docs/integrations/tuya\" target=\"_blank\" rel=\"noopener noreferrer\">ici</a>.",
         "descriptionCreateAccount": "Vous avez besoin de créer un compte sur <a href=\"https://www.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya</a> (<a href=\"https://auth.tuya.com/register\" target=\"_blank\" rel=\"noopener noreferrer\">Créer un compte</a> / <a href=\"https://auth.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Se connecter</a>).",
         "descriptionCreateProject": "Vous devez ensuite créer un \"Cloud Project\" dans votre compte Tuya (console : <a href=\"https://platform.tuya.com/cloud\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Platform</a>).",
-        "descriptionGetKeys": "Vous aurez accès aux deux clés : Client ID et Client Secret.",
-        "descriptionGetAppAccountUid": "Pour avoir votre \"App account UID\", il faut vous rendre dans la section \"Devices\" -> \"Link Tuya App Account\" et ajouter un compte d'application.",
-        "descriptionGetAppAccountUid2": "Une fois que l'ajout est finalisé, votre \"App account UID\" sera dans la colonne UID.",
-        "descriptionTrial": "Les projets Tuya Cloud ont une période d'essai : pensez à la renouveler ou l'étendre régulièrement pour éviter les coupures.",
+        "descriptionGetKeys": "Vous aurez accès aux deux clés : <strong>Client ID</strong> et <strong>Client Secret</strong>.",
+        "descriptionGetAppAccountUid": "Pour avoir votre <strong>App account UID</strong>, il faut vous rendre dans la section \"Devices\" -> \"Link Tuya App Account\" et ajouter un compte d'application.",
+        "descriptionGetAppAccountUid2": "Une fois que l'ajout est finalisé, votre <strong>App account UID</strong> sera dans la colonne UID.",
+        "descriptionTrial": "Les projets Tuya Cloud ont une <strong>période d'essai</strong> : pensez à la <strong>renouveler</strong> ou l'<strong>étendre</strong> régulièrement pour éviter les coupures.",
+        "descriptionCloudLimit": "À noter : l'essai Tuya Cloud permet jusqu'à <strong>10 appareils contrôlables</strong>. Les appareils supplémentaires peuvent rester en <strong>lecture seule</strong> tant que vous n'avez pas mis à niveau.",
+        "descriptionControllable": "Certains appareils sont en <strong>lecture seule</strong> par défaut. Dans la Tuya IoT Platform, ouvrez <strong>Device Permission</strong> puis cliquez sur <strong>Change</strong> pour les rendre contrôlables.",
         "localTitle": "<br /><strong>Local</strong><br />",
         "descriptionLocalMode": "Le mode local peut être utilisé après la configuration cloud : renseignez l'IP locale et la version du protocole sur chaque appareil pour interroger en local. Si les appareils sont sur le même réseau que la machine Gladys, la découverte IP et la version du protocole sont automatiquement détectées. Ce mode permet de se passer du renouvellement cloud, mais il reste nécessaire lors de l'ajout d'un nouvel appareil depuis l'application Tuya.",
+        "descriptionLocalKeepsApp": "<strong>Le contrôle en local</strong> ne désactive pas le contrôle via l'application Tuya/Smart Life.",
+        "descriptionCameraLimit": "<strong>Caméras</strong> : le flux vidéo n'est pas encore pris en charge dans Gladys.",
         "endpoints": {
           "china": "China",
           "westernAmerica": "Western America",
@@ -3400,7 +3405,6 @@
     "category": {
       "button": {
         "click": {
-          "unknown": "{{value}} (valeur inconnue)",
           "1": "Clic simple",
           "2": "Clic double",
           "3": "Pression clic long",
@@ -3484,7 +3488,8 @@
           "81": "Maintien Moins",
           "82": "Relâchement Plus",
           "83": "Relâchement Centre",
-          "84": "Relâchement Moins"
+          "84": "Relâchement Moins",
+          "unknown": "{{value}} (valeur inconnue)"
         }
       },
       "heater": {
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 4e66542222..cfa7cc211c 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -7,62 +7,66 @@ import DeviceFeatures from '../../../../components/device/view/DeviceFeatures';
 import { connect } from 'unistore/preact';
 import { RequestStatus } from '../../../../utils/consts';
 
-const GITHUB_BASE_URL = 'https://github.com/GladysAssistant/Gladys/issues/new';
+const normalizeBoolean = value =>
+  value === true || value === 1 || value === '1' || value === 'true' || value === 'TRUE';
+const ONLINE_RECENT_MINUTES = 5;
 
-const maskIp = ip => {
-  if (!ip || typeof ip !== 'string') {
+const parseDate = dateValue => {
+  if (!dateValue) {
     return null;
   }
-  const parts = ip.split('.');
-  if (parts.length !== 4 || parts.some(part => part === '' || Number.isNaN(parseInt(part, 10)))) {
+  let date = new Date(dateValue);
+  if (!Number.isNaN(date.getTime())) {
+    return date;
+  }
+  if (typeof dateValue === 'string') {
+    const normalized = dateValue.replace(' ', 'T').replace(' +', '+');
+    date = new Date(normalized);
+  }
+  if (Number.isNaN(date.getTime())) {
     return null;
   }
-  return `${parts[0]}.${parts[1]}.x.x`;
+  return date;
 };
 
-const sanitizeParams = params => {
-  if (!Array.isArray(params)) {
-    return [];
+const getMostRecentFeatureDate = device => {
+  if (!Array.isArray(device && device.features)) {
+    return null;
   }
-  return params.map(param => {
-    if (param.name === 'LOCAL_KEY') {
-      return { ...param, value: '***' };
+  return device.features.reduce((mostRecent, feature) => {
+    const featureDate = parseDate(feature && feature.last_value_changed);
+    if (!featureDate) {
+      return mostRecent;
     }
-    if (param.name === 'IP_ADDRESS' || param.name === 'CLOUD_IP') {
-      return { ...param, value: maskIp(param.value) };
+    if (!mostRecent || featureDate > mostRecent) {
+      return featureDate;
     }
-    return param;
-  });
+    return mostRecent;
+  }, null);
 };
 
-const buildIssuePayload = (device, localPollStatus, localPollError) => {
-  const sanitized = { ...device };
-  delete sanitized.local_key;
-  delete sanitized.ip;
-  delete sanitized.cloud_ip;
-  if (Array.isArray(sanitized.params)) {
-    sanitized.params = sanitizeParams(sanitized.params);
+const isReachableFromRecentFeatures = device => {
+  const mostRecentFeatureDate = getMostRecentFeatureDate(device);
+  if (!mostRecentFeatureDate) {
+    return false;
   }
-  sanitized.local_poll = {
-    status: localPollStatus,
-    error: localPollError || null
-  };
-  sanitized.local_ip_masked = maskIp(device.ip);
-  sanitized.cloud_ip_masked = maskIp(device.cloud_ip);
-  return sanitized;
+  return Date.now() - mostRecentFeatureDate.getTime() <= ONLINE_RECENT_MINUTES * 60 * 1000;
 };
 
-const createGithubUrl = (device, localPollStatus, localPollError) => {
-  const title = encodeURIComponent(`Tuya: Add support for ${device.model || device.product_name || device.name}`);
-  const body = encodeURIComponent(
-    `\`\`\`json\n${JSON.stringify(buildIssuePayload(device, localPollStatus, localPollError), null, 2)}\n\`\`\``
-  );
-  return `${GITHUB_BASE_URL}?title=${title}&body=${body}`;
+const resolveOnlineStatus = device => {
+  if (isReachableFromRecentFeatures(device)) {
+    return true;
+  }
+  const online = device && device.online;
+  if (typeof online === 'boolean') {
+    return online;
+  }
+  if (online === 1 || online === 0) {
+    return online === 1;
+  }
+  return false;
 };
 
-const normalizeBoolean = value =>
-  value === true || value === 1 || value === '1' || value === 'true' || value === 'TRUE';
-
 const buildParamsMap = device =>
   (Array.isArray(device && device.params) ? device.params : []).reduce((acc, param) => {
     acc[param.name] = param.value;
@@ -236,7 +240,7 @@ class TuyaDeviceBox extends Component {
       const found = params.find(param => param.name === name);
       return found ? found.value : undefined;
     };
-    const tryProtocols = ['3.5', '3.4', '3.3', '3.1'];
+    const tryProtocols = ['3.4', '3.3', '3.1'];
     const selectedProtocol = getParam('PROTOCOL_VERSION') || this.state.device.protocol_version;
     const protocolList = selectedProtocol ? [selectedProtocol] : tryProtocols;
     try {
@@ -339,9 +343,12 @@ class TuyaDeviceBox extends Component {
         device: savedDevice,
         baselineDevice: savedDevice
       });
+      if (typeof this.props.onDeviceSaved === 'function') {
+        this.props.onDeviceSaved(savedDevice);
+      }
     } catch (e) {
       let errorMessage = 'integration.tuya.error.defaultError';
-      if (e.response.status === 409) {
+      if (e.response && e.response.status === 409) {
         errorMessage = 'integration.tuya.error.conflictError';
       }
       this.setState({
@@ -406,7 +413,7 @@ class TuyaDeviceBox extends Component {
     }
   ) {
     const validModel = device.features && device.features.length > 0;
-    const online = device.online;
+    const online = resolveOnlineStatus(device);
     const paramsArray = Array.isArray(device.params) ? device.params : [];
     const params = paramsArray.reduce((acc, param) => {
       acc[param.name] = param.value;
@@ -596,9 +603,11 @@ class TuyaDeviceBox extends Component {
                     <option value="3.1">3.1</option>
                     <option value="3.3">3.3</option>
                     <option value="3.4">3.4</option>
-                    <option value="3.5">3.5</option>
+                    <option value="3.5" disabled>
+                      <Text id="integration.tuya.device.protocol35OptionUnsupported" />
+                    </option>
                   </select>
-                  {protocolVersion === '3.5' && (
+                  {!showCloudIp && !protocolVersion && (
                     <div class="text-danger mt-2">
                       <Text id="integration.tuya.device.protocol35Unsupported" />
                     </div>
@@ -704,17 +713,6 @@ class TuyaDeviceBox extends Component {
                       <div class="alert alert-warning">
                         <Text id="integration.tuya.unmanagedModelButton" />
                       </div>
-                      <a
-                        class="btn btn-gray"
-                        href={createGithubUrl(this.state.device, localPollStatus, localPollError)}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                      >
-                        <Text id="integration.philipsHue.device.createGithubIssue" />
-                      </a>
-                      <div class="text-muted mt-2">
-                        <Text id="integration.tuya.device.githubIssueInfo" />
-                      </div>
                     </div>
                   )}
 
diff --git a/front/src/routes/integration/all/tuya/device-page/DeviceTab.jsx b/front/src/routes/integration/all/tuya/device-page/DeviceTab.jsx
index 81809346c9..4e21d8d4aa 100644
--- a/front/src/routes/integration/all/tuya/device-page/DeviceTab.jsx
+++ b/front/src/routes/integration/all/tuya/device-page/DeviceTab.jsx
@@ -99,6 +99,9 @@ class DeviceTab extends Component {
           </div>
         </div>
         <div class="card-body">
+          <div class="alert alert-info">
+            <Text id="integration.tuya.localModeLimitInfo" />
+          </div>
           <div
             class={cx('dimmer', {
               active: getTuyaStatus === RequestStatus.Getting
diff --git a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
index f19443f40e..8c46d95a76 100644
--- a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
+++ b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
@@ -1,4 +1,4 @@
-import { Text, Localizer } from 'preact-i18n';
+import { Text, Localizer, MarkupText } from 'preact-i18n';
 import { Link } from 'preact-router/match';
 import cx from 'classnames';
 
@@ -119,6 +119,31 @@ class DiscoverTab extends Component {
     }
   };
 
+  handleDeviceSaved = savedDevice => {
+    if (!savedDevice || !savedDevice.external_id) {
+      this.getDiscoveredDevices();
+      return;
+    }
+    this.setState(prevState => {
+      const { discoveredDevices } = prevState;
+      if (!Array.isArray(discoveredDevices)) {
+        return null;
+      }
+      return {
+        discoveredDevices: discoveredDevices.map(device => {
+          if (device.external_id !== savedDevice.external_id) {
+            return device;
+          }
+          return {
+            ...device,
+            ...savedDevice,
+            updatable: false
+          };
+        })
+      };
+    });
+  };
+
   render(
     props,
     { loading, errorLoading, discoveredDevices, housesWithRooms, udpScanLoading, udpScanError, udpScanPortErrors }
@@ -153,7 +178,10 @@ class DiscoverTab extends Component {
         </div>
         <div class="card-body">
           <div class="alert alert-info">
-            <Text id="integration.tuya.discover.localDiscoveryInfo" />
+            <Text id="integration.tuya.localModeLimitInfo" />
+          </div>
+          <div class="alert alert-info">
+            <MarkupText id="integration.tuya.discover.localDiscoveryInfo" />
           </div>
           <div class="alert alert-secondary">
             <Text id="integration.tuya.discover.description" />
@@ -208,6 +236,7 @@ class DiscoverTab extends Component {
                     device={device}
                     deviceIndex={index}
                     housesWithRooms={housesWithRooms}
+                    onDeviceSaved={this.handleDeviceSaved}
                   />
                 ))}
                 {orderedDevices.length === 0 && <EmptyState />}
diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index f20049c418..a43ce14fe3 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -408,6 +408,9 @@ class SetupTab extends Component {
                   )}
                 </div>
               )}
+              <div class="alert alert-info">
+                <Text id="integration.tuya.localModeLimitInfo" />
+              </div>
               <p>
                 <MarkupText id="integration.tuya.setup.cloudTitle" />
                 <MarkupText id="integration.tuya.setup.description" />
@@ -417,8 +420,12 @@ class SetupTab extends Component {
                 <MarkupText id="integration.tuya.setup.descriptionGetAppAccountUid" />
                 <MarkupText id="integration.tuya.setup.descriptionGetAppAccountUid2" />
                 <MarkupText id="integration.tuya.setup.descriptionTrial" />
+                <MarkupText id="integration.tuya.setup.descriptionCloudLimit" />
+                <MarkupText id="integration.tuya.setup.descriptionControllable" />
                 <MarkupText id="integration.tuya.setup.localTitle" />
                 <MarkupText id="integration.tuya.setup.descriptionLocalMode" />
+                <MarkupText id="integration.tuya.setup.descriptionLocalKeepsApp" />
+                <MarkupText id="integration.tuya.setup.descriptionCameraLimit" />
               </p>
 
               <form>
diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index b5d85d6294..eaf03a3fe2 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -23,6 +23,8 @@ function convertDevice(tuyaDevice) {
     cloud_ip: cloudIp,
     protocol_version: protocolVersion,
     local_override: localOverride,
+    properties,
+    thing_model: thingModel,
     specifications = {},
   } = tuyaDevice;
   const externalId = `tuya:${id}`;
@@ -92,6 +94,9 @@ function convertDevice(tuyaDevice) {
     poll_frequency: DEVICE_POLL_FREQUENCIES.EVERY_30_SECONDS,
     should_poll: true,
     params,
+    properties,
+    specifications,
+    thing_model: thingModel,
   };
   if (online !== undefined) {
     device.online = online;
diff --git a/server/services/tuya/lib/tuya.loadDeviceDetails.js b/server/services/tuya/lib/tuya.loadDeviceDetails.js
index e095493685..99e3fa4fad 100644
--- a/server/services/tuya/lib/tuya.loadDeviceDetails.js
+++ b/server/services/tuya/lib/tuya.loadDeviceDetails.js
@@ -12,15 +12,23 @@ async function loadDeviceDetails(tuyaDevice) {
   const { id: deviceId } = tuyaDevice;
   logger.debug(`Loading ${deviceId} Tuya device specifications`);
 
-  const [specResult, detailsResult] = await Promise.allSettled([
+  const [specResult, detailsResult, propsResult, modelResult] = await Promise.allSettled([
     this.connector.request({
       method: 'GET',
-      path: `${API.VERSION_1_0}/devices/${deviceId}/specification`,
+      path: `${API.VERSION_1_2}/devices/${deviceId}/specification`,
     }),
     this.connector.request({
       method: 'GET',
       path: `${API.VERSION_1_0}/devices/${deviceId}`,
     }),
+    this.connector.request({
+      method: 'GET',
+      path: `${API.VERSION_2_0}/thing/${deviceId}/shadow/properties`,
+    }),
+    this.connector.request({
+      method: 'GET',
+      path: `${API.VERSION_2_0}/thing/${deviceId}/model`,
+    }),
   ]);
 
   if (specResult.status === 'rejected') {
@@ -32,14 +40,42 @@ async function loadDeviceDetails(tuyaDevice) {
       detailsResult.reason && detailsResult.reason.message ? detailsResult.reason.message : detailsResult.reason;
     logger.warn(`[Tuya] Failed to load details for ${deviceId}: ${reason}`);
   }
+  if (propsResult.status === 'rejected') {
+    const reason = propsResult.reason && propsResult.reason.message ? propsResult.reason.message : propsResult.reason;
+    logger.warn(`[Tuya] Failed to load properties for ${deviceId}: ${reason}`);
+  }
+  if (modelResult.status === 'rejected') {
+    const reason = modelResult.reason && modelResult.reason.message ? modelResult.reason.message : modelResult.reason;
+    logger.warn(`[Tuya] Failed to load thing model for ${deviceId}: ${reason}`);
+  }
 
   const specifications = specResult.status === 'fulfilled' ? specResult.value.result || {} : {};
   const details = detailsResult.status === 'fulfilled' ? detailsResult.value.result || {} : {};
+  const properties = propsResult.status === 'fulfilled' ? propsResult.value.result || {} : {};
+  const modelPayload = modelResult.status === 'fulfilled' ? modelResult.value.result || null : null;
+  let thingModel = null;
+  if (modelPayload && typeof modelPayload.model === 'string') {
+    try {
+      thingModel = JSON.parse(modelPayload.model);
+    } catch (e) {
+      logger.warn(`[Tuya] Invalid thing model JSON for ${deviceId}`, e);
+      thingModel = null;
+    }
+  } else if (modelPayload) {
+    thingModel = modelPayload;
+  }
 
-  logger.debug(`[Tuya] Device details loaded for ${deviceId}`);
-  logger.debug(`[Tuya] Device specifications loaded for ${deviceId}`);
+  const category = details.category || tuyaDevice.category;
+  const specificationsWithCategory =
+    category && !specifications.category ? { ...specifications, category } : specifications;
 
-  return { ...tuyaDevice, ...details, specifications };
+  return {
+    ...tuyaDevice,
+    ...details,
+    specifications: specificationsWithCategory,
+    properties,
+    thing_model: thingModel,
+  };
 }
 
 module.exports = {
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index d79fd511cd..91a63a5636 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -3,6 +3,7 @@ const { UDP_KEY } = require('tuyapi/lib/config');
 const { MessageParser } = require('tuyapi/lib/message-parser');
 const logger = require('../../../utils/logger');
 const { mergeDevices } = require('../../../utils/device');
+const { convertDevice } = require('./device/tuya.convertDevice');
 const {
   applyExistingLocalOverride,
   normalizeExistingDevice,
@@ -123,6 +124,29 @@ async function localScan(input = 10) {
 function buildLocalScanResponse(tuyaManager, localScanResult) {
   const localDevicesById = (localScanResult && localScanResult.devices) || {};
   const portErrors = (localScanResult && localScanResult.portErrors) || {};
+  const mergeWithExisting = (device) => {
+    if (!tuyaManager || !tuyaManager.gladys || !tuyaManager.gladys.stateManager) {
+      return device;
+    }
+    const existing = normalizeExistingDevice(
+      tuyaManager.gladys.stateManager.get('deviceByExternalId', device.external_id),
+    );
+    const withLocalOverride = applyExistingLocalOverride(device, existing);
+    return mergeDevices(withLocalOverride, existing);
+  };
+  const buildLocalDiscoveredDevice = (deviceId, localInfo) =>
+    convertDevice.call(tuyaManager, {
+      id: deviceId,
+      name: localInfo && localInfo.name ? localInfo.name : `Tuya ${deviceId}`,
+      product_key: localInfo && localInfo.productKey,
+      ip: localInfo && localInfo.ip,
+      protocol_version: localInfo && localInfo.version,
+      local_override: true,
+      specifications: {
+        functions: [],
+        status: [],
+      },
+    });
 
   if (tuyaManager && Array.isArray(tuyaManager.discoveredDevices)) {
     const updatedDevices = tuyaManager.discoveredDevices.map((device) => {
@@ -130,19 +154,27 @@ function buildLocalScanResponse(tuyaManager, localScanResult) {
       const localInfo = localDevicesById[deviceId];
       return updateDiscoveredDeviceWithLocalInfo(device, localInfo);
     });
-    const mergedDevices = updatedDevices.map((device) => {
-      if (!tuyaManager.gladys || !tuyaManager.gladys.stateManager) {
-        return device;
-      }
-      const existing = normalizeExistingDevice(
-        tuyaManager.gladys.stateManager.get('deviceByExternalId', device.external_id),
-      );
-      const withLocalOverride = applyExistingLocalOverride(device, existing);
-      return mergeDevices(withLocalOverride, existing);
-    });
-    tuyaManager.discoveredDevices = mergedDevices;
+    const mergedDevices = updatedDevices.map((device) => mergeWithExisting(device));
+    const knownExternalIds = new Set(mergedDevices.map((device) => device.external_id));
+    const localOnlyDevices = Object.entries(localDevicesById)
+      .map(([deviceId, localInfo]) => buildLocalDiscoveredDevice(deviceId, localInfo))
+      .filter((device) => !knownExternalIds.has(device.external_id))
+      .map((device) => mergeWithExisting(device));
+    const allDiscoveredDevices = [...mergedDevices, ...localOnlyDevices];
+    tuyaManager.discoveredDevices = allDiscoveredDevices;
+    return {
+      devices: allDiscoveredDevices,
+      local_devices: localDevicesById,
+      port_errors: portErrors,
+    };
+  }
+
+  if (tuyaManager && Object.keys(localDevicesById).length > 0) {
+    const localDiscoveredDevices = Object.entries(localDevicesById)
+      .map(([deviceId, localInfo]) => buildLocalDiscoveredDevice(deviceId, localInfo))
+      .map((device) => mergeWithExisting(device));
     return {
-      devices: mergedDevices,
+      devices: localDiscoveredDevices,
       local_devices: localDevicesById,
       port_errors: portErrors,
     };
diff --git a/server/services/tuya/lib/utils/tuya.constants.js b/server/services/tuya/lib/utils/tuya.constants.js
index be8650589f..def5025421 100644
--- a/server/services/tuya/lib/utils/tuya.constants.js
+++ b/server/services/tuya/lib/utils/tuya.constants.js
@@ -33,6 +33,7 @@ const API = {
   VERSION_1_1: '/v1.1/iot-03',
   VERSION_1_2: '/v1.2/iot-03',
   VERSION_1_3: '/v1.3/iot-03',
+  VERSION_2_0: '/v2.0/cloud',
 };
 
 const DEVICE_PARAM_NAME = {
diff --git a/server/test/services/tuya/lib/controllers/tuya.controller.test.js b/server/test/services/tuya/lib/controllers/tuya.controller.test.js
index 526090bd2b..9ddb962144 100644
--- a/server/test/services/tuya/lib/controllers/tuya.controller.test.js
+++ b/server/test/services/tuya/lib/controllers/tuya.controller.test.js
@@ -140,10 +140,12 @@ describe('TuyaController POST /api/v1/service/tuya/local-scan', () => {
 
     await controller['post /api/v1/service/tuya/local-scan'].controller(req, res);
     assert.calledOnce(tuyaManager.localScan);
-    assert.calledWith(res.json, {
-      local_devices: { device1: { ip: '1.1.1.1', version: '3.3' } },
-      port_errors: {},
-    });
+    assert.calledOnce(res.json);
+    const payload = res.json.firstCall.args[0];
+    expect(payload.devices).to.have.length(1);
+    expect(payload.devices[0].external_id).to.equal('tuya:device1');
+    expect(payload.local_devices).to.deep.equal({ device1: { ip: '1.1.1.1', version: '3.3' } });
+    expect(payload.port_errors).to.deep.equal({});
   });
 
   it('should keep devices unchanged when local info is missing', async () => {
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
index 1d8fb0fada..3f2792dfb9 100644
--- a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
@@ -17,7 +17,10 @@ describe('tuya.convertDevice', () => {
       protocol_version: '3.3',
       local_override: true,
       is_online: true,
+      properties: { properties: [{ code: 'foo', value: 'bar' }] },
+      thing_model: { services: [] },
       specifications: {
+        category: 'cz',
         functions: [{ code: 'switch_1', name: 'Switch', type: 'Boolean' }],
         status: [{ code: 'cur_power', name: 'Power', type: 'Integer' }],
       },
@@ -29,6 +32,13 @@ describe('tuya.convertDevice', () => {
     expect(device.product_key).to.equal('product-key');
     expect(device.online).to.equal(true);
     expect(device.features.length).to.equal(2);
+    expect(device.properties).to.deep.equal({ properties: [{ code: 'foo', value: 'bar' }] });
+    expect(device.thing_model).to.deep.equal({ services: [] });
+    expect(device.specifications).to.deep.equal({
+      category: 'cz',
+      functions: [{ code: 'switch_1', name: 'Switch', type: 'Boolean' }],
+      status: [{ code: 'cur_power', name: 'Power', type: 'Integer' }],
+    });
 
     const params = device.params.reduce((acc, param) => {
       acc[param.name] = param.value;
@@ -60,5 +70,6 @@ describe('tuya.convertDevice', () => {
     expect(device.product_key).to.equal(undefined);
     expect(device.online).to.equal(false);
     expect(device.features.length).to.equal(0);
+    expect(device.specifications).to.deep.equal({});
   });
 });
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index 21a2fdfdf5..708496af6e 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -33,7 +33,7 @@ describe('TuyaHandler.discoverDevices', () => {
     tuyaHandler.connector = {
       request: sinon
         .stub()
-        .onFirstCall()
+        .onCall(0)
         .resolves({
           result: [
             {
@@ -46,7 +46,7 @@ describe('TuyaHandler.discoverDevices', () => {
             },
           ],
         })
-        .onSecondCall()
+        .onCall(1)
         .resolves({
           result: {
             details: 'details',
@@ -64,14 +64,27 @@ describe('TuyaHandler.discoverDevices', () => {
                 type: 'Integer',
               },
             ],
+            category: 'cz',
           },
         })
-        .onThirdCall()
+        .onCall(2)
         .resolves({
           result: {
             local_key: 'localKey',
             ip: '1.1.1.1',
           },
+        })
+        .onCall(3)
+        .resolves({
+          result: {
+            properties: [{ code: 'switch_1', value: true }],
+          },
+        })
+        .onCall(4)
+        .resolves({
+          result: {
+            model: '{"services":[]}',
+          },
         }),
     };
   });
@@ -169,11 +182,35 @@ describe('TuyaHandler.discoverDevices', () => {
             value: false,
           },
         ],
+        properties: {
+          properties: [{ code: 'switch_1', value: true }],
+        },
         product_id: undefined,
         product_key: undefined,
+        specifications: {
+          details: 'details',
+          category: 'cz',
+          functions: [
+            {
+              code: 'switch_1',
+              name: 'name',
+              type: 'Boolean',
+            },
+          ],
+          status: [
+            {
+              code: 'cur_power',
+              name: 'cur_power',
+              type: 'Integer',
+            },
+          ],
+        },
         selector: 'tuya:uuid',
         service_id: 'ffa13430-df93-488a-9733-5c540e9558e0',
         should_poll: true,
+        thing_model: {
+          services: [],
+        },
         online: true,
       },
     ]);
@@ -188,7 +225,7 @@ describe('TuyaHandler.discoverDevices', () => {
       payload: { status: STATUS.CONNECTED },
     });
 
-    assert.callCount(tuyaHandler.connector.request, 3);
+    assert.callCount(tuyaHandler.connector.request, 5);
   });
 
   it('should keep local params from existing devices', async () => {
diff --git a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
index a04c3c93c8..5b6e282621 100644
--- a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
@@ -5,6 +5,7 @@ const { assert } = sinon;
 
 const TuyaHandler = require('../../../../services/tuya/lib/index');
 const { API } = require('../../../../services/tuya/lib/utils/tuya.constants');
+const logger = require('../../../../utils/logger');
 
 const gladys = {};
 const serviceId = 'ffa13430-df93-488a-9733-5c540e9558e0';
@@ -17,30 +18,192 @@ describe('TuyaHandler.loadDeviceDetails', () => {
     tuyaHandler.connector = {
       request: sinon
         .stub()
-        .onFirstCall()
+        .onCall(0)
         .resolves({ result: { details: 'specification' } })
-        .onSecondCall()
-        .resolves({ result: { local_key: 'localKey' } }),
+        .onCall(1)
+        .resolves({ result: { local_key: 'localKey' } })
+        .onCall(2)
+        .resolves({ result: { dps: { 1: true } } })
+        .onCall(3)
+        .resolves({ result: { model: '{"services":[]}' } }),
     };
   });
 
   afterEach(() => {
     sinon.reset();
+    if (logger.warn.restore) {
+      logger.warn.restore();
+    }
   });
 
   it('should load device details', async () => {
     const devices = await tuyaHandler.loadDeviceDetails({ id: 1 });
 
-    expect(devices).to.deep.eq({ id: 1, local_key: 'localKey', specifications: { details: 'specification' } });
+    expect(devices).to.deep.eq({
+      id: 1,
+      local_key: 'localKey',
+      specifications: { details: 'specification' },
+      properties: { dps: { 1: true } },
+      thing_model: { services: [] },
+    });
 
-    assert.callCount(tuyaHandler.connector.request, 2);
+    assert.callCount(tuyaHandler.connector.request, 4);
     assert.calledWith(tuyaHandler.connector.request, {
       method: 'GET',
-      path: `${API.VERSION_1_0}/devices/1/specification`,
+      path: `${API.VERSION_1_2}/devices/1/specification`,
     });
     assert.calledWith(tuyaHandler.connector.request, {
       method: 'GET',
       path: `${API.VERSION_1_0}/devices/1`,
     });
+    assert.calledWith(tuyaHandler.connector.request, {
+      method: 'GET',
+      path: `${API.VERSION_2_0}/thing/1/shadow/properties`,
+    });
+    assert.calledWith(tuyaHandler.connector.request, {
+      method: 'GET',
+      path: `${API.VERSION_2_0}/thing/1/model`,
+    });
+  });
+
+  it('should preserve category in specifications when only available in details', async () => {
+    tuyaHandler.connector.request = sinon
+      .stub()
+      .onCall(0)
+      .resolves({ result: { functions: [], status: [] } })
+      .onCall(1)
+      .resolves({ result: { local_key: 'localKey', category: 'cz' } })
+      .onCall(2)
+      .resolves({ result: { dps: { 1: true } } })
+      .onCall(3)
+      .resolves({ result: { model: '{"services":[]}' } });
+
+    const device = await tuyaHandler.loadDeviceDetails({ id: 1 });
+
+    expect(device.specifications.category).to.equal('cz');
+  });
+
+  it('should warn when specifications loading fails', async () => {
+    const warnStub = sinon.stub(logger, 'warn');
+    tuyaHandler.connector.request = sinon
+      .stub()
+      .onCall(0)
+      .rejects(new Error('spec failure'))
+      .onCall(1)
+      .resolves({ result: { local_key: 'localKey' } })
+      .onCall(2)
+      .resolves({ result: { dps: { 1: true } } })
+      .onCall(3)
+      .resolves({ result: { model: '{"services":[]}' } });
+
+    const device = await tuyaHandler.loadDeviceDetails({ id: 1 });
+
+    expect(device).to.deep.eq({
+      id: 1,
+      local_key: 'localKey',
+      specifications: {},
+      properties: { dps: { 1: true } },
+      thing_model: { services: [] },
+    });
+    expect(warnStub.calledOnce).to.equal(true);
+    expect(warnStub.firstCall.args[0]).to.match(/Failed to load specifications/);
+  });
+
+  it('should warn when details loading fails', async () => {
+    const warnStub = sinon.stub(logger, 'warn');
+    tuyaHandler.connector.request = sinon
+      .stub()
+      .onCall(0)
+      .resolves({ result: { details: 'specification' } })
+      .onCall(1)
+      .rejects(new Error('details failure'))
+      .onCall(2)
+      .resolves({ result: { dps: { 1: true } } })
+      .onCall(3)
+      .resolves({ result: { model: '{"services":[]}' } });
+
+    const device = await tuyaHandler.loadDeviceDetails({ id: 1 });
+
+    expect(device).to.deep.eq({
+      id: 1,
+      specifications: { details: 'specification' },
+      properties: { dps: { 1: true } },
+      thing_model: { services: [] },
+    });
+    expect(warnStub.calledOnce).to.equal(true);
+    expect(warnStub.firstCall.args[0]).to.match(/Failed to load details/);
+  });
+
+  it('should warn when properties and model loading fails', async () => {
+    const warnStub = sinon.stub(logger, 'warn');
+    tuyaHandler.connector.request = sinon
+      .stub()
+      .onCall(0)
+      .resolves({ result: { details: 'specification' } })
+      .onCall(1)
+      .resolves({ result: { local_key: 'localKey' } })
+      .onCall(2)
+      .rejects(new Error('props failure'))
+      .onCall(3)
+      .rejects(new Error('model failure'));
+
+    const device = await tuyaHandler.loadDeviceDetails({ id: 1 });
+
+    expect(device).to.deep.eq({
+      id: 1,
+      local_key: 'localKey',
+      specifications: { details: 'specification' },
+      properties: {},
+      thing_model: null,
+    });
+    expect(warnStub.callCount).to.equal(2);
+    expect(warnStub.firstCall.args[0]).to.match(/Failed to load properties/);
+    expect(warnStub.secondCall.args[0]).to.match(/Failed to load thing model/);
+  });
+
+  it('should handle invalid thing model json', async () => {
+    tuyaHandler.connector.request = sinon
+      .stub()
+      .onCall(0)
+      .resolves({ result: { details: 'specification' } })
+      .onCall(1)
+      .resolves({ result: { local_key: 'localKey' } })
+      .onCall(2)
+      .resolves({ result: { dps: { 1: true } } })
+      .onCall(3)
+      .resolves({ result: { model: 'not-json' } });
+
+    const device = await tuyaHandler.loadDeviceDetails({ id: 1 });
+
+    expect(device).to.deep.eq({
+      id: 1,
+      local_key: 'localKey',
+      specifications: { details: 'specification' },
+      properties: { dps: { 1: true } },
+      thing_model: null,
+    });
+  });
+
+  it('should keep thing model when model is an object', async () => {
+    tuyaHandler.connector.request = sinon
+      .stub()
+      .onCall(0)
+      .resolves({ result: { details: 'specification' } })
+      .onCall(1)
+      .resolves({ result: { local_key: 'localKey' } })
+      .onCall(2)
+      .resolves({ result: { dps: { 1: true } } })
+      .onCall(3)
+      .resolves({ result: { services: [] } });
+
+    const device = await tuyaHandler.loadDeviceDetails({ id: 1 });
+
+    expect(device).to.deep.eq({
+      id: 1,
+      local_key: 'localKey',
+      specifications: { details: 'specification' },
+      properties: { dps: { 1: true } },
+      thing_model: { services: [] },
+    });
   });
 });
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index b152e4ddfe..6cee1a7295 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -293,4 +293,32 @@ describe('TuyaHandler.buildLocalScanResponse', () => {
 
     expect(response).to.deep.equal({ local_devices: {}, port_errors: {} });
   });
+
+  it('should append local-only devices when cloud discovered list is empty', () => {
+    const { buildLocalScanResponse } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
+      './device/tuya.convertDevice': {
+        convertDevice: sinon.stub().callsFake((device) => ({
+          external_id: `tuya:${device.id}`,
+          params: [{ name: 'IP_ADDRESS', value: device.ip }],
+        })),
+      },
+    });
+    const tuyaManager = {
+      discoveredDevices: [],
+      gladys: {
+        stateManager: {
+          get: sinon.stub().returns(null),
+        },
+      },
+    };
+
+    const response = buildLocalScanResponse(tuyaManager, {
+      devices: { device2: { ip: '2.2.2.2', version: '3.3', productKey: 'pkey' } },
+      portErrors: {},
+    });
+
+    expect(response.devices).to.have.length(1);
+    expect(response.devices[0].external_id).to.equal('tuya:device2');
+    expect(response.local_devices).to.deep.equal({ device2: { ip: '2.2.2.2', version: '3.3', productKey: 'pkey' } });
+  });
 });

From 3c0de0cc59d1252a108f2e4a714f7b756612210b Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Thu, 26 Feb 2026 19:32:48 +0100
Subject: [PATCH 32/90] test(tuya): avoid unhandled rejection warning in local
 poll timeout

---
 .../test/services/tuya/lib/tuya.localPoll.test.js   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index 1cf8aa5f28..2719620638 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -159,15 +159,12 @@ describe('TuyaHandler.localPoll', () => {
         protocolVersion: '3.3',
         timeoutMs: 1000,
       });
+      // Attach handler immediately to avoid PromiseRejectionHandledWarning with fake timers.
+      const errorPromise = promise.catch((error) => error);
       await clock.tickAsync(1100);
-      try {
-        await promise;
-      } catch (e) {
-        expect(e).to.be.instanceOf(BadParameters);
-        expect(e.message).to.equal('Local poll timeout');
-        return;
-      }
-      throw new Error('Expected error');
+      const error = await errorPromise;
+      expect(error).to.be.instanceOf(BadParameters);
+      expect(error.message).to.equal('Local poll timeout');
     } finally {
       clock.restore();
     }

From 92a913ffec80e325ce55a7897d8ddc75dba287f3 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 11:07:43 +0100
Subject: [PATCH 33/90] refactor(tuya): normalize booleans and stabilize base
 conversions

---
 .../tuya/lib/device/tuya.convertDevice.js     |  6 ++--
 .../tuya/lib/device/tuya.convertFeature.js    |  2 +-
 .../tuya/lib/device/tuya.deviceMapping.js     |  5 ++--
 .../tuya/lib/utils/tuya.deviceParams.js       | 29 ++++++++++---------
 .../services/tuya/lib/utils/tuya.normalize.js |  8 +++--
 .../feature/tuya.convertFeature.test.js       |  4 +--
 .../device/feature/tuya.deviceMapping.test.js |  4 +++
 .../lib/device/tuya.convertDevice.test.js     |  2 +-
 .../tuya/lib/tuya.discoverDevices.test.js     |  2 +-
 .../tuya/lib/utils/tuya.deviceParams.test.js  | 10 +++++++
 10 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index eaf03a3fe2..2b38468b45 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -1,5 +1,6 @@
 const { DEVICE_POLL_FREQUENCIES } = require('../../../../utils/constants');
 const { DEVICE_PARAM_NAME } = require('../utils/tuya.constants');
+const { normalizeBoolean } = require('../utils/tuya.normalize');
 const { convertFeature } = require('./tuya.convertFeature');
 const logger = require('../../../../utils/logger');
 
@@ -30,6 +31,7 @@ function convertDevice(tuyaDevice) {
   const externalId = `tuya:${id}`;
   const { functions = [], status = [] } = specifications;
   const online = tuyaDevice.online !== undefined ? tuyaDevice.online : tuyaDevice.is_online;
+  const normalizedLocalOverride = normalizeBoolean(localOverride);
 
   const params = [];
   if (id) {
@@ -45,7 +47,7 @@ function convertDevice(tuyaDevice) {
     params.push({ name: DEVICE_PARAM_NAME.CLOUD_IP, value: cloudIp });
   }
   if (localOverride !== undefined && localOverride !== null) {
-    params.push({ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: localOverride });
+    params.push({ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: normalizedLocalOverride });
   }
   if (protocolVersion) {
     params.push({ name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: protocolVersion });
@@ -62,7 +64,7 @@ function convertDevice(tuyaDevice) {
     model: productName || model,
     product_id: productId,
     protocol_version: protocolVersion,
-    local_override: localOverride,
+    local_override: normalizedLocalOverride,
     online,
   };
   logger.debug('Tuya convert device specifications');
diff --git a/server/services/tuya/lib/device/tuya.convertFeature.js b/server/services/tuya/lib/device/tuya.convertFeature.js
index c882a5653e..592b5b1534 100644
--- a/server/services/tuya/lib/device/tuya.convertFeature.js
+++ b/server/services/tuya/lib/device/tuya.convertFeature.js
@@ -28,7 +28,7 @@ function convertFeature(tuyaFunctions, externalId) {
   }
 
   const feature = {
-    name,
+    name: code || name,
     external_id: `${externalId}:${code}`,
     selector: `${externalId}:${code}`,
     read_only: readOnly,
diff --git a/server/services/tuya/lib/device/tuya.deviceMapping.js b/server/services/tuya/lib/device/tuya.deviceMapping.js
index 09ea472700..7ee5203cf9 100644
--- a/server/services/tuya/lib/device/tuya.deviceMapping.js
+++ b/server/services/tuya/lib/device/tuya.deviceMapping.js
@@ -4,6 +4,7 @@ const {
   DEVICE_FEATURE_UNITS,
   COVER_STATE,
 } = require('../../../../utils/constants');
+const { normalizeBoolean } = require('../utils/tuya.normalize');
 
 const { intToRgb, rgbToHsb, rgbToInt, hsbToRgb } = require('../../../../utils/colors');
 
@@ -146,7 +147,7 @@ const writeValues = {
 const readValues = {
   [DEVICE_FEATURE_CATEGORIES.LIGHT]: {
     [DEVICE_FEATURE_TYPES.LIGHT.BINARY]: (valueFromDevice) => {
-      return valueFromDevice === true ? 1 : 0;
+      return normalizeBoolean(valueFromDevice) ? 1 : 0;
     },
     [DEVICE_FEATURE_TYPES.LIGHT.BRIGHTNESS]: (valueFromDevice) => {
       return valueFromDevice;
@@ -164,7 +165,7 @@ const readValues = {
 
   [DEVICE_FEATURE_CATEGORIES.SWITCH]: {
     [DEVICE_FEATURE_TYPES.SWITCH.BINARY]: (valueFromDevice) => {
-      return valueFromDevice === true ? 1 : 0;
+      return normalizeBoolean(valueFromDevice) ? 1 : 0;
     },
     [DEVICE_FEATURE_TYPES.SWITCH.ENERGY]: (valueFromDevice) => {
       return parseInt(valueFromDevice, 10) / 100;
diff --git a/server/services/tuya/lib/utils/tuya.deviceParams.js b/server/services/tuya/lib/utils/tuya.deviceParams.js
index dcf3a27aff..e4bae3b1b0 100644
--- a/server/services/tuya/lib/utils/tuya.deviceParams.js
+++ b/server/services/tuya/lib/utils/tuya.deviceParams.js
@@ -13,6 +13,14 @@ const upsertParam = (params, name, value) => {
   }
 };
 
+const getParamValue = (params, name) => {
+  if (!Array.isArray(params)) {
+    return undefined;
+  }
+  const found = params.find((param) => param.name === name);
+  return found ? found.value : undefined;
+};
+
 const normalizeExistingDevice = (device) => {
   if (!device || !Array.isArray(device.params)) {
     return device;
@@ -48,22 +56,14 @@ const updateDiscoveredDeviceWithLocalInfo = (device, localInfo) => {
   return updated;
 };
 
-const getExistingParamValue = (existingDevice, name) => {
-  if (!existingDevice || !Array.isArray(existingDevice.params)) {
-    return undefined;
-  }
-  const param = existingDevice.params.find((item) => item.name === name);
-  return param ? param.value : undefined;
-};
-
 const applyExistingLocalParams = (device, existingDevice) => {
   if (!existingDevice) {
     return device;
   }
   const params = Array.isArray(device.params) ? [...device.params] : [];
-  const ipValue = getExistingParamValue(existingDevice, DEVICE_PARAM_NAME.IP_ADDRESS);
-  const protocolValue = getExistingParamValue(existingDevice, DEVICE_PARAM_NAME.PROTOCOL_VERSION);
-  const rawLocalOverrideValue = getExistingParamValue(existingDevice, DEVICE_PARAM_NAME.LOCAL_OVERRIDE);
+  const ipValue = getParamValue(existingDevice.params, DEVICE_PARAM_NAME.IP_ADDRESS);
+  const protocolValue = getParamValue(existingDevice.params, DEVICE_PARAM_NAME.PROTOCOL_VERSION);
+  const rawLocalOverrideValue = getParamValue(existingDevice.params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE);
   const localOverrideValue =
     rawLocalOverrideValue !== undefined && rawLocalOverrideValue !== null
       ? normalizeBoolean(rawLocalOverrideValue)
@@ -73,13 +73,15 @@ const applyExistingLocalParams = (device, existingDevice) => {
   upsertParam(params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, protocolValue);
   upsertParam(params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE, localOverrideValue);
 
+  const resolvedLocalOverride =
+    localOverrideValue !== undefined && localOverrideValue !== null ? localOverrideValue : device.local_override;
+
   return {
     ...device,
     params,
     ip: ipValue !== undefined && ipValue !== null ? ipValue : device.ip,
     protocol_version: protocolValue !== undefined && protocolValue !== null ? protocolValue : device.protocol_version,
-    local_override:
-      localOverrideValue !== undefined && localOverrideValue !== null ? localOverrideValue : device.local_override,
+    local_override: resolvedLocalOverride,
   };
 };
 
@@ -102,6 +104,7 @@ const applyExistingLocalOverride = (device, existingDevice) => {
 module.exports = {
   applyExistingLocalOverride,
   applyExistingLocalParams,
+  getParamValue,
   normalizeExistingDevice,
   updateDiscoveredDeviceWithLocalInfo,
   upsertParam,
diff --git a/server/services/tuya/lib/utils/tuya.normalize.js b/server/services/tuya/lib/utils/tuya.normalize.js
index c087ed10a2..3bcd035346 100644
--- a/server/services/tuya/lib/utils/tuya.normalize.js
+++ b/server/services/tuya/lib/utils/tuya.normalize.js
@@ -1,5 +1,9 @@
-const normalizeBoolean = (value) =>
-  value === true || value === 1 || value === '1' || value === 'true' || value === 'TRUE';
+const normalizeBoolean = (value) => {
+  if (value === true || value === 1 || value === '1') {
+    return true;
+  }
+  return typeof value === 'string' && ['true', 'on'].includes(value.trim().toLowerCase());
+};
 
 module.exports = {
   normalizeBoolean,
diff --git a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
index bd39be94ab..d3a03c9bbd 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
@@ -25,7 +25,7 @@ describe('Tuya convert feature', () => {
       has_feedback: false,
       max: 1000,
       min: 100,
-      name: 'name',
+      name: 'switch_1',
       read_only: false,
       selector: 'externalId:switch_1',
       type: 'binary',
@@ -49,7 +49,7 @@ describe('Tuya convert feature', () => {
       has_feedback: false,
       max: 1,
       min: 0,
-      name: 'name',
+      name: 'switch_1',
       read_only: false,
       selector: 'externalId:switch_1',
       type: 'binary',
diff --git a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
index 9412c4720a..ad1c7a6c4f 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
@@ -74,6 +74,10 @@ describe('Tuya device mapping', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.BINARY](true);
         expect(result).to.eq(1);
       });
+      it('switch string on', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.BINARY]('ON');
+        expect(result).to.eq(1);
+      });
       it('energy', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.ENERGY]('30');
         expect(result).to.eq(0.3);
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
index 3f2792dfb9..ff9b155ea3 100644
--- a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
@@ -15,7 +15,7 @@ describe('tuya.convertDevice', () => {
       ip: '1.1.1.1',
       cloud_ip: '2.2.2.2',
       protocol_version: '3.3',
-      local_override: true,
+      local_override: ' TRUE ',
       is_online: true,
       properties: { properties: [{ code: 'foo', value: 'bar' }] },
       thing_model: { services: [] },
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index 708496af6e..2c5a6fb9a1 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -155,7 +155,7 @@ describe('TuyaHandler.discoverDevices', () => {
             has_feedback: false,
             max: 1,
             min: 0,
-            name: 'name',
+            name: 'switch_1',
             read_only: false,
             selector: 'tuya:uuid:switch_1',
             type: 'binary',
diff --git a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
index 8d6f66a2a4..019affa968 100644
--- a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
+++ b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
@@ -4,6 +4,7 @@ const { expect } = require('chai');
 const {
   applyExistingLocalOverride,
   applyExistingLocalParams,
+  getParamValue,
   normalizeExistingDevice,
   updateDiscoveredDeviceWithLocalInfo,
   upsertParam,
@@ -40,6 +41,15 @@ describe('Tuya device params utils', () => {
     expect(other.value).to.equal('x');
   });
 
+  it('should get param value', () => {
+    const params = [
+      { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '1.1.1.1' },
+      { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.3' },
+    ];
+    expect(getParamValue(params, DEVICE_PARAM_NAME.IP_ADDRESS)).to.equal('1.1.1.1');
+    expect(getParamValue(params, 'MISSING')).to.equal(undefined);
+  });
+
   it('should not normalize local override when value is null', () => {
     const device = {
       params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: null }],

From 1d1fda4af55112f789727071ffaff90f9cfb9fe2 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Thu, 26 Feb 2026 18:57:02 +0100
Subject: [PATCH 34/90] feat(tuya): add local protocol 3.5 support with newgen
 api

---
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 11 +--
 server/services/tuya/lib/tuya.localPoll.js    | 17 ++++-
 server/services/tuya/lib/tuya.localScan.js    | 50 ++++++++-----
 server/services/tuya/lib/tuya.setValue.js     | 52 ++++++++-----
 server/services/tuya/package-lock.json        | 74 +++++++++++++++++++
 server/services/tuya/package.json             |  1 +
 .../services/tuya/lib/tuya.localPoll.test.js  | 12 +++
 .../services/tuya/lib/tuya.localScan.test.js  | 16 ++--
 .../services/tuya/lib/tuya.setValue.test.js   | 51 +++++++++++++
 9 files changed, 228 insertions(+), 56 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index cfa7cc211c..d396e16c3d 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -240,7 +240,7 @@ class TuyaDeviceBox extends Component {
       const found = params.find(param => param.name === name);
       return found ? found.value : undefined;
     };
-    const tryProtocols = ['3.4', '3.3', '3.1'];
+    const tryProtocols = ['3.5', '3.4', '3.3', '3.1'];
     const selectedProtocol = getParam('PROTOCOL_VERSION') || this.state.device.protocol_version;
     const protocolList = selectedProtocol ? [selectedProtocol] : tryProtocols;
     try {
@@ -603,15 +603,8 @@ class TuyaDeviceBox extends Component {
                     <option value="3.1">3.1</option>
                     <option value="3.3">3.3</option>
                     <option value="3.4">3.4</option>
-                    <option value="3.5" disabled>
-                      <Text id="integration.tuya.device.protocol35OptionUnsupported" />
-                    </option>
+                    <option value="3.5">3.5</option>
                   </select>
-                  {!showCloudIp && !protocolVersion && (
-                    <div class="text-danger mt-2">
-                      <Text id="integration.tuya.device.protocol35Unsupported" />
-                    </div>
-                  )}
                 </div>
 
                 <div class="form-group">
diff --git a/server/services/tuya/lib/tuya.localPoll.js b/server/services/tuya/lib/tuya.localPoll.js
index 87783ab6aa..840c064119 100644
--- a/server/services/tuya/lib/tuya.localPoll.js
+++ b/server/services/tuya/lib/tuya.localPoll.js
@@ -1,4 +1,5 @@
 const TuyAPI = require('tuyapi');
+const TuyAPINewGen = require('@demirdeniz/tuyapi-newgen');
 const logger = require('../../../utils/logger');
 const { BadParameters } = require('../../../utils/coreErrors');
 const { mergeDevices } = require('../../../utils/device');
@@ -14,18 +15,28 @@ const { normalizeExistingDevice, upsertParam } = require('./utils/tuya.devicePar
  */
 async function localPoll(payload) {
   const { deviceId, ip, localKey, protocolVersion, timeoutMs = 3000, fastScan = false } = payload || {};
-  const effectiveTimeout = protocolVersion === '3.5' && !fastScan ? Math.max(timeoutMs, 5000) : timeoutMs;
+  const isProtocol35 = protocolVersion === '3.5';
+  const effectiveTimeout = isProtocol35 && !fastScan ? Math.max(timeoutMs, 5000) : timeoutMs;
+  const TuyaLocalApi = isProtocol35 ? TuyAPINewGen : TuyAPI;
 
   if (!deviceId || !ip || !localKey || !protocolVersion) {
     throw new BadParameters('Missing local connection parameters');
   }
 
-  const tuyaLocal = new TuyAPI({
+  const tuyaOptions = {
     id: deviceId,
     key: localKey,
     ip,
     version: protocolVersion,
-  });
+    issueGetOnConnect: false,
+    issueRefreshOnConnect: false,
+    issueRefreshOnPing: false,
+  };
+  if (isProtocol35) {
+    tuyaOptions.KeepAlive = false;
+    tuyaOptions.socketTimeout = Math.max(effectiveTimeout, 5000);
+  }
+  const tuyaLocal = new TuyaLocalApi(tuyaOptions);
   let lastError = null;
   const onError = (err) => {
     lastError = err;
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index 91a63a5636..924af7086f 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -1,6 +1,6 @@
 const dgram = require('dgram');
-const { UDP_KEY } = require('tuyapi/lib/config');
-const { MessageParser } = require('tuyapi/lib/message-parser');
+const { UDP_KEY } = require('@demirdeniz/tuyapi-newgen/lib/config');
+const { MessageParser } = require('@demirdeniz/tuyapi-newgen/lib/message-parser');
 const logger = require('../../../utils/logger');
 const { mergeDevices } = require('../../../utils/device');
 const { convertDevice } = require('./device/tuya.convertDevice');
@@ -24,7 +24,7 @@ async function localScan(input = 10) {
   const devices = {};
   const portErrors = {};
   const sockets = [];
-  const parser = new MessageParser({ key: UDP_KEY, version: 3.1 });
+  const parsers = [new MessageParser({ key: UDP_KEY, version: 3.1 }), new MessageParser({ key: UDP_KEY, version: 3.5 })];
 
   logger.info(`[Tuya][localScan] Starting udp scan for ${timeoutSeconds}s on ports ${DEFAULT_PORTS.join(', ')}`);
 
@@ -34,24 +34,36 @@ async function localScan(input = 10) {
     const remote = rinfo ? `${rinfo.address}:${rinfo.port}` : 'unknown';
     const source = rinfo && rinfo.source ? rinfo.source : 'udp';
     logger.debug(`[Tuya][localScan] Packet received (${source}) from ${remote} len=${byteLen}`);
-    try {
-      const parsed = parser.parse(message);
-      const safePayload =
-        parsed && parsed[0] && parsed[0].payload
-          ? {
-              gwId: parsed[0].payload.gwId,
-              devId: parsed[0].payload.devId,
-              id: parsed[0].payload.id,
-              version: parsed[0].payload.version,
-              hasIp: !!parsed[0].payload.ip,
-            }
-          : null;
-      logger.debug(`[Tuya][localScan] Parsed packet from ${remote}: ${JSON.stringify(safePayload)}`);
-      payload = parsed && parsed[0] && parsed[0].payload;
-    } catch (e) {
-      logger.info(`[Tuya][localScan] Unable to parse payload from ${remote} (len=${byteLen}): ${e.message}`);
+    let parsed = null;
+    let lastError = null;
+    for (let i = 0; i < parsers.length; i += 1) {
+      try {
+        parsed = parsers[i].parse(message);
+        break;
+      } catch (e) {
+        lastError = e;
+      }
+    }
+    if (!parsed) {
+      logger.info(
+        `[Tuya][localScan] Unable to parse payload from ${remote} (len=${byteLen}): ${
+          lastError ? lastError.message : 'unknown'
+        }`,
+      );
       return;
     }
+    const safePayload =
+      parsed && parsed[0] && parsed[0].payload
+        ? {
+            gwId: parsed[0].payload.gwId,
+            devId: parsed[0].payload.devId,
+            id: parsed[0].payload.id,
+            version: parsed[0].payload.version,
+            hasIp: !!parsed[0].payload.ip,
+          }
+        : null;
+    logger.debug(`[Tuya][localScan] Parsed packet from ${remote}: ${JSON.stringify(safePayload)}`);
+    payload = parsed && parsed[0] && parsed[0].payload;
 
     if (!payload || typeof payload !== 'object') {
       logger.info(`[Tuya][localScan] Ignoring payload from ${remote} (len=${byteLen}): invalid payload`);
diff --git a/server/services/tuya/lib/tuya.setValue.js b/server/services/tuya/lib/tuya.setValue.js
index ad7642e2f3..4103f8a38a 100644
--- a/server/services/tuya/lib/tuya.setValue.js
+++ b/server/services/tuya/lib/tuya.setValue.js
@@ -1,4 +1,5 @@
 const TuyAPI = require('tuyapi');
+const TuyAPINewGen = require('@demirdeniz/tuyapi-newgen');
 const logger = require('../../../utils/logger');
 const { API } = require('./utils/tuya.constants');
 const { BadParameters } = require('../../../utils/coreErrors');
@@ -60,29 +61,46 @@ async function setValue(device, deviceFeature, value) {
   const localDps = getLocalDpsFromCode(command);
 
   if (hasLocalConfig && localDps !== null) {
-    const tuyaLocal = new TuyAPI({
+    const isProtocol35 = protocolVersion === '3.5';
+    const TuyaLocalApi = isProtocol35 ? TuyAPINewGen : TuyAPI;
+    const tuyaOptions = {
       id: topic,
       key: localKey,
       ip: ipAddress,
       version: protocolVersion,
-    });
-    let connected = false;
-    try {
-      await tuyaLocal.connect();
-      connected = true;
-      await tuyaLocal.set({ dps: localDps, set: transformedValue });
-      logger.debug(`[Tuya][setValue][local] device=${topic} dps=${localDps} value=${transformedValue}`);
-      return;
-    } catch (e) {
-      logger.warn(`[Tuya][setValue][local] failed, fallback to cloud`, e);
-    } finally {
-      if (connected) {
-        try {
-          await tuyaLocal.disconnect();
-        } catch (disconnectError) {
-          logger.warn('[Tuya][setValue][local] disconnect failed', disconnectError);
+      issueGetOnConnect: false,
+      issueRefreshOnConnect: false,
+      issueRefreshOnPing: false,
+    };
+    if (isProtocol35) {
+      tuyaOptions.KeepAlive = false;
+    }
+    const runLocalSet = async () => {
+      const tuyaLocal = new TuyaLocalApi(tuyaOptions);
+      let connected = false;
+      try {
+        await tuyaLocal.connect();
+        connected = true;
+        await tuyaLocal.set({ dps: localDps, set: transformedValue });
+        logger.debug(`[Tuya][setValue][local] device=${topic} dps=${localDps} value=${transformedValue}`);
+        return true;
+      } catch (e) {
+        logger.warn(`[Tuya][setValue][local] failed, fallback to cloud`, e);
+        return false;
+      } finally {
+        if (connected) {
+          try {
+            await tuyaLocal.disconnect();
+          } catch (disconnectError) {
+            logger.warn('[Tuya][setValue][local] disconnect failed', disconnectError);
+          }
         }
       }
+    };
+
+    const localSuccess = await runLocalSet();
+    if (localSuccess) {
+      return;
     }
   }
 
diff --git a/server/services/tuya/package-lock.json b/server/services/tuya/package-lock.json
index 73a7164847..fdcb68b7c8 100644
--- a/server/services/tuya/package-lock.json
+++ b/server/services/tuya/package-lock.json
@@ -18,10 +18,84 @@
         "win32"
       ],
       "dependencies": {
+        "@demirdeniz/tuyapi-newgen": "^8.1.5",
         "@tuya/tuya-connector-nodejs": "^2.1.2",
         "tuyapi": "^7.2.0"
       }
     },
+    "node_modules/@demirdeniz/tuyapi-newgen": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@demirdeniz/tuyapi-newgen/-/tuyapi-newgen-8.1.5.tgz",
+      "integrity": "sha512-AfVQ2g2G8jtGyNbQd+Iw4SXx4SV+bT4w3I6B6BxXodzvFfAnBFNRiezfs8aHqlhmqpjH1d4mVnP42trZ7rIeNw==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.7",
+        "p-queue": "6.6.2",
+        "p-retry": "4.6.2",
+        "p-timeout": "3.2.0"
+      }
+    },
+    "node_modules/@demirdeniz/tuyapi-newgen/node_modules/@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "license": "MIT"
+    },
+    "node_modules/@demirdeniz/tuyapi-newgen/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@demirdeniz/tuyapi-newgen/node_modules/p-queue": {
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
+      "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.4",
+        "p-timeout": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@demirdeniz/tuyapi-newgen/node_modules/p-retry": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@demirdeniz/tuyapi-newgen/node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/@tuya/tuya-connector-nodejs": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@tuya/tuya-connector-nodejs/-/tuya-connector-nodejs-2.1.2.tgz",
diff --git a/server/services/tuya/package.json b/server/services/tuya/package.json
index 6ecc3f55ef..b49087d5b3 100644
--- a/server/services/tuya/package.json
+++ b/server/services/tuya/package.json
@@ -13,6 +13,7 @@
     "arm64"
   ],
   "dependencies": {
+    "@demirdeniz/tuyapi-newgen": "^8.1.5",
     "@tuya/tuya-connector-nodejs": "^2.1.2",
     "tuyapi": "^7.2.0"
   }
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index 2719620638..1fad264df5 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -16,6 +16,7 @@ describe('TuyaHandler.localPoll', () => {
   it('should throw if missing parameters', async () => {
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: function TuyAPIStub() {},
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
     try {
       await localPoll({});
@@ -39,6 +40,7 @@ describe('TuyaHandler.localPoll', () => {
     }
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
     const result = await localPoll({
       deviceId: 'device',
@@ -64,6 +66,7 @@ describe('TuyaHandler.localPoll', () => {
     }
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
     try {
       await localPoll({
@@ -90,6 +93,9 @@ describe('TuyaHandler.localPoll', () => {
       .resolves({ dps: { 1: true } });
     const disconnect = sinon.stub().resolves();
     function TuyAPIStub() {
+      throw new Error('tuyapi should not be used for protocol 3.5');
+    }
+    function TuyAPINewGenStub() {
       this.connect = connect;
       this.get = get;
       this.disconnect = disconnect;
@@ -97,6 +103,7 @@ describe('TuyaHandler.localPoll', () => {
     }
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': TuyAPINewGenStub,
     });
     const result = await localPoll({
       deviceId: 'device',
@@ -121,6 +128,7 @@ describe('TuyaHandler.localPoll', () => {
     }
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
     try {
       await localPoll({
@@ -151,6 +159,7 @@ describe('TuyaHandler.localPoll', () => {
       };
       const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
         tuyapi: TuyAPIStub,
+        '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
       });
       const promise = localPoll({
         deviceId: 'device',
@@ -188,6 +197,7 @@ describe('TuyaHandler.localPoll', () => {
     }
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
 
     try {
@@ -223,6 +233,7 @@ describe('TuyaHandler.localPoll', () => {
     }
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
 
     try {
@@ -253,6 +264,7 @@ describe('TuyaHandler.localPoll', () => {
     }
     const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
 
     try {
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index 6cee1a7295..537967dcbb 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -47,8 +47,8 @@ describe('TuyaHandler.localScan', () => {
 
     const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
       dgram: dgramStub,
-      'tuyapi/lib/message-parser': { MessageParser: MessageParserStub },
-      'tuyapi/lib/config': { UDP_KEY: 'key' },
+      '@demirdeniz/tuyapi-newgen/lib/message-parser': { MessageParser: MessageParserStub },
+      '@demirdeniz/tuyapi-newgen/lib/config': { UDP_KEY: 'key' },
     });
 
     const clock = sinon.useFakeTimers();
@@ -113,8 +113,8 @@ describe('TuyaHandler.localScan', () => {
 
     const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
       dgram: dgramStub,
-      'tuyapi/lib/message-parser': { MessageParser: MessageParserStub },
-      'tuyapi/lib/config': { UDP_KEY: 'key' },
+      '@demirdeniz/tuyapi-newgen/lib/message-parser': { MessageParser: MessageParserStub },
+      '@demirdeniz/tuyapi-newgen/lib/config': { UDP_KEY: 'key' },
     });
 
     const clock = sinon.useFakeTimers();
@@ -185,8 +185,8 @@ describe('TuyaHandler.localScan', () => {
 
     const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
       dgram: dgramStub,
-      'tuyapi/lib/message-parser': { MessageParser: MessageParserStub },
-      'tuyapi/lib/config': { UDP_KEY: 'key' },
+      '@demirdeniz/tuyapi-newgen/lib/message-parser': { MessageParser: MessageParserStub },
+      '@demirdeniz/tuyapi-newgen/lib/config': { UDP_KEY: 'key' },
     });
 
     const clock = sinon.useFakeTimers();
@@ -232,8 +232,8 @@ describe('TuyaHandler.localScan', () => {
 
     const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
       dgram: dgramStub,
-      'tuyapi/lib/message-parser': { MessageParser: MessageParserStub },
-      'tuyapi/lib/config': { UDP_KEY: 'key' },
+      '@demirdeniz/tuyapi-newgen/lib/message-parser': { MessageParser: MessageParserStub },
+      '@demirdeniz/tuyapi-newgen/lib/config': { UDP_KEY: 'key' },
     });
 
     const clock = sinon.useFakeTimers();
diff --git a/server/test/services/tuya/lib/tuya.setValue.test.js b/server/test/services/tuya/lib/tuya.setValue.test.js
index 0a302d5283..7045e584b8 100644
--- a/server/test/services/tuya/lib/tuya.setValue.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.test.js
@@ -104,6 +104,7 @@ describe('TuyaHandler.setValue', () => {
     }
     const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
 
     const device = {
@@ -134,6 +135,51 @@ describe('TuyaHandler.setValue', () => {
     expect(ctx.connector.request.called).to.equal(false);
   });
 
+  it('should call local tuyapi-newgen for protocol 3.5', async () => {
+    const connect = sinon.stub().resolves();
+    const set = sinon.stub().resolves();
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      throw new Error('tuyapi should not be used for protocol 3.5');
+    }
+    function TuyAPINewGenStub() {
+      this.connect = connect;
+      this.set = set;
+      this.disconnect = disconnect;
+    }
+    const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
+      tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': TuyAPINewGenStub,
+    });
+
+    const device = {
+      params: [
+        { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '10.0.0.2' },
+        { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+        { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.5' },
+        { name: DEVICE_PARAM_NAME.CLOUD_IP, value: '1.1.1.1' },
+        { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+      ],
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:switch_1',
+      category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+      type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub() },
+      gladys: {},
+    };
+
+    await setValue.call(ctx, device, deviceFeature, 1);
+
+    expect(connect.calledOnce).to.equal(true);
+    expect(set.calledOnce).to.equal(true);
+    expect(disconnect.calledOnce).to.equal(true);
+    expect(ctx.connector.request.called).to.equal(false);
+  });
+
   it('should call local tuyapi with switch code', async () => {
     const connect = sinon.stub().resolves();
     const set = sinon.stub().resolves();
@@ -145,6 +191,7 @@ describe('TuyaHandler.setValue', () => {
     }
     const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
 
     const device = {
@@ -186,6 +233,7 @@ describe('TuyaHandler.setValue', () => {
     }
     const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
 
     const device = {
@@ -225,6 +273,7 @@ describe('TuyaHandler.setValue', () => {
     }
     const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
 
     const device = {
@@ -264,6 +313,7 @@ describe('TuyaHandler.setValue', () => {
     }
     const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
 
     const device = {
@@ -327,6 +377,7 @@ describe('TuyaHandler.setValue', () => {
     }
     const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
       tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
     });
 
     const device = {

From e3b95f0bde27cb1a283a09d6eba6f3138eb59884 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Thu, 26 Feb 2026 19:05:06 +0100
Subject: [PATCH 35/90] fix(tuya): resolve prefer-const in local scan parser

---
 server/services/tuya/lib/tuya.localScan.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index 924af7086f..01145dde3f 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -24,12 +24,14 @@ async function localScan(input = 10) {
   const devices = {};
   const portErrors = {};
   const sockets = [];
-  const parsers = [new MessageParser({ key: UDP_KEY, version: 3.1 }), new MessageParser({ key: UDP_KEY, version: 3.5 })];
+  const parsers = [
+    new MessageParser({ key: UDP_KEY, version: 3.1 }),
+    new MessageParser({ key: UDP_KEY, version: 3.5 }),
+  ];
 
   logger.info(`[Tuya][localScan] Starting udp scan for ${timeoutSeconds}s on ports ${DEFAULT_PORTS.join(', ')}`);
 
   const onMessage = (message, rinfo) => {
-    let payload;
     const byteLen = message ? message.length : 0;
     const remote = rinfo ? `${rinfo.address}:${rinfo.port}` : 'unknown';
     const source = rinfo && rinfo.source ? rinfo.source : 'udp';
@@ -63,7 +65,7 @@ async function localScan(input = 10) {
           }
         : null;
     logger.debug(`[Tuya][localScan] Parsed packet from ${remote}: ${JSON.stringify(safePayload)}`);
-    payload = parsed && parsed[0] && parsed[0].payload;
+    const payload = parsed && parsed[0] && parsed[0].payload;
 
     if (!payload || typeof payload !== 'object') {
       logger.info(`[Tuya][localScan] Ignoring payload from ${remote} (len=${byteLen}): invalid payload`);

From 74b081e76d64be813fd3a79b037886f742e65258 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Thu, 26 Feb 2026 19:34:22 +0100
Subject: [PATCH 36/90] chore(tuya): remove obsolete protocol 3.5 unsupported
 i18n keys

---
 front/src/config/i18n/de.json | 2 --
 front/src/config/i18n/en.json | 2 --
 front/src/config/i18n/fr.json | 2 --
 3 files changed, 6 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 8a714b3516..7ae92c45d0 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1217,8 +1217,6 @@
         "idLabel": "Geräte-ID",
         "localKeyLabel": "Lokaler Schlüssel",
         "protocolVersionLabel": "Protokollversion",
-        "protocol35OptionUnsupported": "3.5 (Nicht unterstützt)",
-        "protocol35Unsupported": "Das Tuya-Protokoll 3.5 wird lokal noch nicht unterstützt. Bitte nutze den Cloud-Modus oder 3.1/3.3/3.4.",
         "ipAddressLabel": "IP-Adresse",
         "ipModeLocal": "Lokal",
         "ipModeCloud": "Cloud",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index a6953d7224..a101d1b669 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1112,8 +1112,6 @@
         "idLabel": "Device ID",
         "localKeyLabel": "Local Key",
         "protocolVersionLabel": "Protocol Version",
-        "protocol35OptionUnsupported": "3.5 (Not supported)",
-        "protocol35Unsupported": "Tuya protocol 3.5 is not supported locally yet. Please use cloud mode or protocol 3.1/3.3/3.4.",
         "ipAddressLabel": "IP Address",
         "ipModeLocal": "Local",
         "ipModeCloud": "Cloud",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index 6592e028a0..f4383d59af 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1347,8 +1347,6 @@
         "idLabel": "Identifiant de l'appareil",
         "localKeyLabel": "Clé locale",
         "protocolVersionLabel": "Version du protocole",
-        "protocol35OptionUnsupported": "3.5 (Non supporté)",
-        "protocol35Unsupported": "Le protocole Tuya 3.5 n'est pas pris en charge en local pour le moment. Utilisez le mode cloud ou les protocoles 3.1/3.3/3.4.",
         "ipAddressLabel": "Adresse IP",
         "ipModeLocal": "Local",
         "ipModeCloud": "Cloud",

From 50ac34780271ac6e5a1d9d1b5b7a33052c4b794b Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 12:58:23 +0100
Subject: [PATCH 37/90] codecov: rerun


From 0a9f8355b0f374b3f0d6e54eded3e24d9645262d Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 11:04:34 +0100
Subject: [PATCH 38/90] feat(tuya): add mapping core for cloud/local smart
 socket support

---
 front/src/config/i18n/de.json                 |   1 -
 front/src/config/i18n/en.json                 |   1 -
 front/src/config/i18n/fr.json                 |   5 +-
 .../integration/all/tuya/TuyaDeviceBox.jsx    |   8 +-
 .../all/tuya/device-page/DeviceTab.jsx        |   3 -
 .../all/tuya/discover-page/DiscoverTab.jsx    |   3 -
 .../all/tuya/setup-page/SetupTab.jsx          |   3 -
 server/services/tuya/api/tuya.controller.js   |   5 +-
 .../tuya/lib/device/tuya.convertDevice.js     |  28 +-
 .../tuya/lib/device/tuya.convertFeature.js    |  30 +-
 .../tuya/lib/device/tuya.deviceMapping.js     |  99 +------
 .../tuya/lib/device/tuya.localMapping.js      |  85 ++++++
 .../tuya/lib/mappings/cloud/global.js         |  80 +++++
 .../tuya/lib/mappings/cloud/smart-socket.js   |  53 ++++
 server/services/tuya/lib/mappings/index.js    | 235 +++++++++++++++
 .../tuya/lib/mappings/local/global.js         |  11 +
 .../tuya/lib/mappings/local/smart-socket.js   |  20 ++
 server/services/tuya/lib/tuya.localPoll.js    |  11 +-
 server/services/tuya/lib/tuya.poll.js         | 276 ++++++++++++++++--
 server/services/tuya/lib/tuya.setValue.js     |  27 +-
 .../feature/tuya.convertFeature.test.js       |  19 ++
 .../device/feature/tuya.deviceMapping.test.js |  12 +
 .../lib/device/tuya.convertDevice.test.js     |  10 +
 .../tuya/lib/device/tuya.localMapping.test.js |  92 ++++++
 .../services/tuya/lib/mappings/index.test.js  | 110 +++++++
 .../tuya/lib/tuya.discoverDevices.test.js     |   5 +
 .../services/tuya/lib/tuya.localPoll.test.js  |  31 +-
 .../test/services/tuya/lib/tuya.poll.test.js  | 241 ++++++++++++++-
 .../tuya/lib/utils/tuya.deviceParams.test.js  |   7 +
 29 files changed, 1340 insertions(+), 171 deletions(-)
 create mode 100644 server/services/tuya/lib/device/tuya.localMapping.js
 create mode 100644 server/services/tuya/lib/mappings/cloud/global.js
 create mode 100644 server/services/tuya/lib/mappings/cloud/smart-socket.js
 create mode 100644 server/services/tuya/lib/mappings/index.js
 create mode 100644 server/services/tuya/lib/mappings/local/global.js
 create mode 100644 server/services/tuya/lib/mappings/local/smart-socket.js
 create mode 100644 server/test/services/tuya/lib/device/tuya.localMapping.test.js
 create mode 100644 server/test/services/tuya/lib/mappings/index.test.js

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 7ae92c45d0..8642e7c117 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1201,7 +1201,6 @@
       "alreadyCreatedButton": "Bereits erstellt",
       "deleteButton": "Löschen",
       "unmanagedModelButton": "Modell nicht verwaltet oder verfügbar",
-      "localModeLimitInfo": "Der lokale Modus wird noch verbessert. Bei manchen Geräten können Befehle oder Status-Updates weiterhin über die Tuya-Cloud laufen, auch wenn der lokale Modus aktiviert ist.",
       "status": {
         "notConnected": "Gladys konnte keine Verbindung zum Tuya-Cloud-Account herstellen. Bitte gehe zur ",
         "setupPageLink": "Tuya-Einrichtungsseite.",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index a101d1b669..85418ee0d5 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1096,7 +1096,6 @@
       "alreadyCreatedButton": "Already created",
       "deleteButton": "Delete",
       "unmanagedModelButton": "Model not managed or available",
-      "localModeLimitInfo": "Local mode is still being improved. For some devices, commands or state updates may still use Tuya cloud even if Local mode is selected.",
       "status": {
         "notConnected": "Gladys failed to connect to Tuya cloud account, please go to ",
         "setupPageLink": "Tuya configuration page.",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index f4383d59af..f51152dd14 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1331,7 +1331,6 @@
       "alreadyCreatedButton": "Déjà créé",
       "deleteButton": "Supprimer",
       "unmanagedModelButton": "Modèle non pris en charge ou non disponible",
-      "localModeLimitInfo": "Le mode local est encore en amélioration. Pour certains appareils, les commandes ou retours d'état peuvent encore passer par le cloud Tuya, même si le mode Local est activé.",
       "status": {
         "notConnected": "Gladys n'a pas réussi à se connecter au compte cloud Tuya, plus d'informations sur la ",
         "setupPageLink": "page de configuration Tuya.",
@@ -1377,7 +1376,7 @@
       },
       "setup": {
         "title": "Configuration Tuya",
-        "cloudTitle": "<strong>Cloud</strong><br />",
+        "cloudTitle": "<strong class=\"h5 d-block\">Cloud</strong>",
         "description": "Vous pouvez connecter Gladys à votre compte cloud Tuya pour commander les appareils associés. La documentation est disponible dans le menu de gauche ou <a href=\"https://gladysassistant.com/fr/docs/integrations/tuya\" target=\"_blank\" rel=\"noopener noreferrer\">ici</a>.",
         "descriptionCreateAccount": "Vous avez besoin de créer un compte sur <a href=\"https://www.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya</a> (<a href=\"https://auth.tuya.com/register\" target=\"_blank\" rel=\"noopener noreferrer\">Créer un compte</a> / <a href=\"https://auth.tuya.com/\" target=\"_blank\" rel=\"noopener noreferrer\">Se connecter</a>).",
         "descriptionCreateProject": "Vous devez ensuite créer un \"Cloud Project\" dans votre compte Tuya (console : <a href=\"https://platform.tuya.com/cloud\" target=\"_blank\" rel=\"noopener noreferrer\">Tuya IoT Platform</a>).",
@@ -1387,7 +1386,7 @@
         "descriptionTrial": "Les projets Tuya Cloud ont une <strong>période d'essai</strong> : pensez à la <strong>renouveler</strong> ou l'<strong>étendre</strong> régulièrement pour éviter les coupures.",
         "descriptionCloudLimit": "À noter : l'essai Tuya Cloud permet jusqu'à <strong>10 appareils contrôlables</strong>. Les appareils supplémentaires peuvent rester en <strong>lecture seule</strong> tant que vous n'avez pas mis à niveau.",
         "descriptionControllable": "Certains appareils sont en <strong>lecture seule</strong> par défaut. Dans la Tuya IoT Platform, ouvrez <strong>Device Permission</strong> puis cliquez sur <strong>Change</strong> pour les rendre contrôlables.",
-        "localTitle": "<br /><strong>Local</strong><br />",
+        "localTitle": "<br /><strong class=\"h5 d-block\">Local</strong><br />",
         "descriptionLocalMode": "Le mode local peut être utilisé après la configuration cloud : renseignez l'IP locale et la version du protocole sur chaque appareil pour interroger en local. Si les appareils sont sur le même réseau que la machine Gladys, la découverte IP et la version du protocole sont automatiquement détectées. Ce mode permet de se passer du renouvellement cloud, mais il reste nécessaire lors de l'ajout d'un nouvel appareil depuis l'application Tuya.",
         "descriptionLocalKeepsApp": "<strong>Le contrôle en local</strong> ne désactive pas le contrôle via l'application Tuya/Smart Life.",
         "descriptionCameraLimit": "<strong>Caméras</strong> : le flux vidéo n'est pas encore pris en charge dans Gladys.",
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index d396e16c3d..da7bf65b02 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -10,6 +10,8 @@ import { RequestStatus } from '../../../../utils/consts';
 const normalizeBoolean = value =>
   value === true || value === 1 || value === '1' || value === 'true' || value === 'TRUE';
 const ONLINE_RECENT_MINUTES = 5;
+const LOCAL_POLL_FREQUENCY = 10 * 1000;
+const CLOUD_POLL_FREQUENCY = 30 * 1000;
 
 const parseDate = dateValue => {
   if (!dateValue) {
@@ -338,7 +340,11 @@ class TuyaDeviceBox extends Component {
       errorMessage: null
     });
     try {
-      const savedDevice = await this.props.httpClient.post(`/api/v1/device`, this.state.device);
+      const payload = {
+        ...this.state.device,
+        poll_frequency: getLocalConfig(this.state.device).localOverride ? LOCAL_POLL_FREQUENCY : CLOUD_POLL_FREQUENCY
+      };
+      const savedDevice = await this.props.httpClient.post(`/api/v1/device`, payload);
       this.setState({
         device: savedDevice,
         baselineDevice: savedDevice
diff --git a/front/src/routes/integration/all/tuya/device-page/DeviceTab.jsx b/front/src/routes/integration/all/tuya/device-page/DeviceTab.jsx
index 4e21d8d4aa..81809346c9 100644
--- a/front/src/routes/integration/all/tuya/device-page/DeviceTab.jsx
+++ b/front/src/routes/integration/all/tuya/device-page/DeviceTab.jsx
@@ -99,9 +99,6 @@ class DeviceTab extends Component {
           </div>
         </div>
         <div class="card-body">
-          <div class="alert alert-info">
-            <Text id="integration.tuya.localModeLimitInfo" />
-          </div>
           <div
             class={cx('dimmer', {
               active: getTuyaStatus === RequestStatus.Getting
diff --git a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
index 8c46d95a76..9b11ca22cb 100644
--- a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
+++ b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
@@ -177,9 +177,6 @@ class DiscoverTab extends Component {
           </div>
         </div>
         <div class="card-body">
-          <div class="alert alert-info">
-            <Text id="integration.tuya.localModeLimitInfo" />
-          </div>
           <div class="alert alert-info">
             <MarkupText id="integration.tuya.discover.localDiscoveryInfo" />
           </div>
diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index a43ce14fe3..4aadcfd29c 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -408,9 +408,6 @@ class SetupTab extends Component {
                   )}
                 </div>
               )}
-              <div class="alert alert-info">
-                <Text id="integration.tuya.localModeLimitInfo" />
-              </div>
               <p>
                 <MarkupText id="integration.tuya.setup.cloudTitle" />
                 <MarkupText id="integration.tuya.setup.description" />
diff --git a/server/services/tuya/api/tuya.controller.js b/server/services/tuya/api/tuya.controller.js
index 373cd6800a..397fb77e11 100644
--- a/server/services/tuya/api/tuya.controller.js
+++ b/server/services/tuya/api/tuya.controller.js
@@ -22,7 +22,10 @@ module.exports = function TuyaController(tuyaManager) {
   async function localPoll(req, res) {
     const payload = req.body || {};
     const result = await tuyaManager.localPoll(payload);
-    const updatedDevice = updateDiscoveredDeviceAfterLocalPoll(tuyaManager, payload);
+    const updatedDevice = updateDiscoveredDeviceAfterLocalPoll(tuyaManager, {
+      ...payload,
+      dps: result.dps,
+    });
 
     if (updatedDevice) {
       res.json({
diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index 2b38468b45..e74ec6946b 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -2,6 +2,7 @@ const { DEVICE_POLL_FREQUENCIES } = require('../../../../utils/constants');
 const { DEVICE_PARAM_NAME } = require('../utils/tuya.constants');
 const { normalizeBoolean } = require('../utils/tuya.normalize');
 const { convertFeature } = require('./tuya.convertFeature');
+const { getDeviceType, getIgnoredCloudCodes, getIgnoredLocalDps } = require('../mappings');
 const logger = require('../../../../utils/logger');
 
 /**
@@ -27,6 +28,7 @@ function convertDevice(tuyaDevice) {
     properties,
     thing_model: thingModel,
     specifications = {},
+    category,
   } = tuyaDevice;
   const externalId = `tuya:${id}`;
   const { functions = [], status = [] } = specifications;
@@ -82,22 +84,44 @@ function convertDevice(tuyaDevice) {
     groups[code] = { ...func, readOnly: false };
   });
 
-  const features = Object.values(groups).map((group) => convertFeature(group, externalId));
+  const deviceType = getDeviceType({
+    specifications,
+    model,
+    product_name: productName,
+    product_id: productId,
+    name,
+    category: specifications.category || category,
+  });
+  const ignoredCloudCodes = getIgnoredCloudCodes(deviceType);
+  const ignoredLocalDps = getIgnoredLocalDps(deviceType);
+  const features = Object.values(groups).map((group) =>
+    convertFeature(group, externalId, {
+      deviceType,
+      ignoredCloudCodes,
+    }),
+  );
 
   const device = {
     name,
     features: features.filter((feature) => feature),
+    device_type: deviceType,
     external_id: externalId,
     selector: externalId,
     model: productName || model,
     product_id: productId,
     product_key: productKey,
     service_id: this.serviceId,
-    poll_frequency: DEVICE_POLL_FREQUENCIES.EVERY_30_SECONDS,
+    poll_frequency: normalizedLocalOverride
+      ? DEVICE_POLL_FREQUENCIES.EVERY_10_SECONDS
+      : DEVICE_POLL_FREQUENCIES.EVERY_30_SECONDS,
     should_poll: true,
     params,
     properties,
     specifications,
+    tuya_mapping: {
+      ignored_local_dps: ignoredLocalDps,
+      ignored_cloud_codes: ignoredCloudCodes,
+    },
     thing_model: thingModel,
   };
   if (online !== undefined) {
diff --git a/server/services/tuya/lib/device/tuya.convertFeature.js b/server/services/tuya/lib/device/tuya.convertFeature.js
index 592b5b1534..6e045cd1b4 100644
--- a/server/services/tuya/lib/device/tuya.convertFeature.js
+++ b/server/services/tuya/lib/device/tuya.convertFeature.js
@@ -1,30 +1,42 @@
 const logger = require('../../../../utils/logger');
-const { mappings } = require('./tuya.deviceMapping');
+const { getFeatureMapping, getIgnoredCloudCodes, normalizeCode } = require('../mappings');
 
 /**
  * @description Transforms Tuya feature as Gladys feature.
  * @param {object} tuyaFunctions - Functions from Tuya.
  * @param {string} externalId - Gladys external ID.
+ * @param {object} options - Mapping options.
  * @returns {object} Gladys feature or undefined.
  * @example
  * convertFeature({ code: 'switch', type: 'Boolean', values: '{}' }, 'tuya:device_id');
  */
-function convertFeature(tuyaFunctions, externalId) {
+function convertFeature(tuyaFunctions, externalId, options = {}) {
   const { code, values, name, readOnly } = tuyaFunctions;
+  const { deviceType, ignoredCloudCodes } = options;
 
-  const featuresCategoryAndType = mappings[code];
+  const codeLower = normalizeCode(code);
+  const ignoredCodes = Array.isArray(ignoredCloudCodes) ? ignoredCloudCodes : getIgnoredCloudCodes(deviceType);
+  if (codeLower && ignoredCodes.includes(codeLower)) {
+    return undefined;
+  }
+
+  const featuresCategoryAndType = getFeatureMapping(code, deviceType);
   if (!featuresCategoryAndType) {
     logger.warn(`Tuya function with "${code}" code is not managed`);
     return undefined;
   }
 
   let valuesObject = {};
-  try {
-    valuesObject = JSON.parse(values);
-  } catch (e) {
-    logger.error(
-      `Tuya function as unmappable "${values}" values on "${featuresCategoryAndType.category}/${featuresCategoryAndType.type}" type with "${code}" code`,
-    );
+  if (values && typeof values === 'object') {
+    valuesObject = values;
+  } else if (typeof values === 'string') {
+    try {
+      valuesObject = JSON.parse(values);
+    } catch (e) {
+      logger.error(
+        `Tuya function as unmappable "${values}" values on "${featuresCategoryAndType.category}/${featuresCategoryAndType.type}" type with "${code}" code`,
+      );
+    }
   }
 
   const feature = {
diff --git a/server/services/tuya/lib/device/tuya.deviceMapping.js b/server/services/tuya/lib/device/tuya.deviceMapping.js
index 7ee5203cf9..14eaa53212 100644
--- a/server/services/tuya/lib/device/tuya.deviceMapping.js
+++ b/server/services/tuya/lib/device/tuya.deviceMapping.js
@@ -1,105 +1,12 @@
-const {
-  DEVICE_FEATURE_TYPES,
-  DEVICE_FEATURE_CATEGORIES,
-  DEVICE_FEATURE_UNITS,
-  COVER_STATE,
-} = require('../../../../utils/constants');
-const { normalizeBoolean } = require('../utils/tuya.normalize');
+const { DEVICE_FEATURE_TYPES, DEVICE_FEATURE_CATEGORIES, COVER_STATE } = require('../../../../utils/constants');
 
 const { intToRgb, rgbToHsb, rgbToInt, hsbToRgb } = require('../../../../utils/colors');
-
-const SWITCH_LED = 'switch_led';
-const BRIGHT_VALUE_V2 = 'bright_value_v2';
-const TEMP_VALUE_V2 = 'temp_value_v2';
-const COLOUR_DATA_V2 = 'colour_data_v2';
-
-const COLOUR_DATA = 'colour_data';
-
-const ADD_ELE = 'add_ele';
-const CUR_CURRENT = 'cur_current';
-const CUR_POWER = 'cur_power';
-const CUR_VOLTAGE = 'cur_voltage';
-
-const SWITCH_1 = 'switch_1';
-const SWITCH_2 = 'switch_2';
-const SWITCH_3 = 'switch_3';
-const SWITCH_4 = 'switch_4';
-
-const CONTROL = 'control';
-const PERCENT_CONTROL = 'percent_control';
+const { normalizeBoolean } = require('../utils/tuya.normalize');
 
 const OPEN = 'open';
 const CLOSE = 'close';
 const STOP = 'stop';
 
-const mappings = {
-  [SWITCH_LED]: {
-    category: DEVICE_FEATURE_CATEGORIES.LIGHT,
-    type: DEVICE_FEATURE_TYPES.LIGHT.BINARY,
-  },
-  [BRIGHT_VALUE_V2]: {
-    category: DEVICE_FEATURE_CATEGORIES.LIGHT,
-    type: DEVICE_FEATURE_TYPES.LIGHT.BRIGHTNESS,
-  },
-  [TEMP_VALUE_V2]: {
-    category: DEVICE_FEATURE_CATEGORIES.LIGHT,
-    type: DEVICE_FEATURE_TYPES.LIGHT.TEMPERATURE,
-  },
-  [COLOUR_DATA_V2]: {
-    category: DEVICE_FEATURE_CATEGORIES.LIGHT,
-    type: DEVICE_FEATURE_TYPES.LIGHT.COLOR,
-  },
-  [COLOUR_DATA]: {
-    category: DEVICE_FEATURE_CATEGORIES.LIGHT,
-    type: DEVICE_FEATURE_TYPES.LIGHT.COLOR,
-  },
-
-  [SWITCH_1]: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  [SWITCH_2]: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  [SWITCH_3]: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  [SWITCH_4]: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
-  },
-  [CONTROL]: {
-    category: DEVICE_FEATURE_CATEGORIES.CURTAIN,
-    type: DEVICE_FEATURE_TYPES.CURTAIN.STATE,
-  },
-  [PERCENT_CONTROL]: {
-    category: DEVICE_FEATURE_CATEGORIES.CURTAIN,
-    type: DEVICE_FEATURE_TYPES.CURTAIN.POSITION,
-  },
-  [ADD_ELE]: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.ENERGY,
-    unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
-  },
-  [CUR_CURRENT]: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.CURRENT,
-    unit: DEVICE_FEATURE_UNITS.MILLI_AMPERE,
-  },
-  [CUR_POWER]: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.POWER,
-    unit: DEVICE_FEATURE_UNITS.WATT,
-  },
-  [CUR_VOLTAGE]: {
-    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
-    type: DEVICE_FEATURE_TYPES.SWITCH.VOLTAGE,
-    unit: DEVICE_FEATURE_UNITS.VOLT,
-  },
-};
-
 const writeValues = {
   [DEVICE_FEATURE_CATEGORIES.LIGHT]: {
     [DEVICE_FEATURE_TYPES.LIGHT.BINARY]: (valueFromGladys) => {
@@ -196,4 +103,4 @@ const readValues = {
   },
 };
 
-module.exports = { mappings, readValues, writeValues };
+module.exports = { readValues, writeValues };
diff --git a/server/services/tuya/lib/device/tuya.localMapping.js b/server/services/tuya/lib/device/tuya.localMapping.js
new file mode 100644
index 0000000000..773134ba6a
--- /dev/null
+++ b/server/services/tuya/lib/device/tuya.localMapping.js
@@ -0,0 +1,85 @@
+const { convertFeature } = require('./tuya.convertFeature');
+const { getDeviceType, getLocalMapping, normalizeCode } = require('../mappings');
+
+const getLocalDpsFromCode = (code, device) => {
+  if (!code) {
+    return null;
+  }
+
+  const normalized = normalizeCode(code);
+  const deviceType = device && device.device_type ? device.device_type : getDeviceType(device);
+  const localMapping = getLocalMapping(deviceType);
+
+  if (localMapping.dps && localMapping.dps[normalized] !== undefined) {
+    return localMapping.dps[normalized];
+  }
+
+  const aliases = localMapping.codeAliases && localMapping.codeAliases[normalized];
+  if (Array.isArray(aliases)) {
+    const matchedAlias = aliases
+      .map((alias) => normalizeCode(alias))
+      .find((aliasCode) => aliasCode && localMapping.dps && localMapping.dps[aliasCode] !== undefined);
+
+    if (matchedAlias) {
+      return localMapping.dps[matchedAlias];
+    }
+  }
+
+  if (localMapping.strict) {
+    return null;
+  }
+
+  if (normalized === 'switch' || normalized === 'power') {
+    return 1;
+  }
+
+  const match = normalized.match(/_(\d+)$/);
+  if (match) {
+    return parseInt(match[1], 10);
+  }
+
+  return null;
+};
+
+const hasDpsKey = (dps, key) => {
+  if (!dps || typeof dps !== 'object') {
+    return false;
+  }
+  const stringKey = String(key);
+  return Object.prototype.hasOwnProperty.call(dps, stringKey) || Object.prototype.hasOwnProperty.call(dps, key);
+};
+
+const addFallbackBinaryFeature = (device, dps) => {
+  if (!device || !device.external_id) {
+    return device;
+  }
+
+  const hasFeatures = Array.isArray(device.features) && device.features.length > 0;
+  if (hasFeatures || !hasDpsKey(dps, 1)) {
+    return device;
+  }
+
+  const fallbackFeature = convertFeature(
+    {
+      code: 'switch_1',
+      values: '{}',
+      name: 'Switch',
+      readOnly: false,
+    },
+    device.external_id,
+    {
+      deviceType: device.device_type,
+    },
+  );
+
+  if (fallbackFeature) {
+    device.features = [fallbackFeature];
+  }
+
+  return device;
+};
+
+module.exports = {
+  addFallbackBinaryFeature,
+  getLocalDpsFromCode,
+};
diff --git a/server/services/tuya/lib/mappings/cloud/global.js b/server/services/tuya/lib/mappings/cloud/global.js
new file mode 100644
index 0000000000..bd76d84d2d
--- /dev/null
+++ b/server/services/tuya/lib/mappings/cloud/global.js
@@ -0,0 +1,80 @@
+const {
+  DEVICE_FEATURE_TYPES,
+  DEVICE_FEATURE_CATEGORIES,
+  DEVICE_FEATURE_UNITS,
+} = require('../../../../../utils/constants');
+
+module.exports = {
+  switch_led: {
+    category: DEVICE_FEATURE_CATEGORIES.LIGHT,
+    type: DEVICE_FEATURE_TYPES.LIGHT.BINARY,
+  },
+  switch: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  power: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  bright_value_v2: {
+    category: DEVICE_FEATURE_CATEGORIES.LIGHT,
+    type: DEVICE_FEATURE_TYPES.LIGHT.BRIGHTNESS,
+  },
+  temp_value_v2: {
+    category: DEVICE_FEATURE_CATEGORIES.LIGHT,
+    type: DEVICE_FEATURE_TYPES.LIGHT.TEMPERATURE,
+  },
+  colour_data_v2: {
+    category: DEVICE_FEATURE_CATEGORIES.LIGHT,
+    type: DEVICE_FEATURE_TYPES.LIGHT.COLOR,
+  },
+  colour_data: {
+    category: DEVICE_FEATURE_CATEGORIES.LIGHT,
+    type: DEVICE_FEATURE_TYPES.LIGHT.COLOR,
+  },
+  switch_1: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  switch_2: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  switch_3: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  switch_4: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  control: {
+    category: DEVICE_FEATURE_CATEGORIES.CURTAIN,
+    type: DEVICE_FEATURE_TYPES.CURTAIN.STATE,
+  },
+  percent_control: {
+    category: DEVICE_FEATURE_CATEGORIES.CURTAIN,
+    type: DEVICE_FEATURE_TYPES.CURTAIN.POSITION,
+  },
+  add_ele: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.ENERGY,
+    unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
+  },
+  cur_current: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.CURRENT,
+    unit: DEVICE_FEATURE_UNITS.MILLI_AMPERE,
+  },
+  cur_power: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.POWER,
+    unit: DEVICE_FEATURE_UNITS.WATT,
+  },
+  cur_voltage: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.VOLTAGE,
+    unit: DEVICE_FEATURE_UNITS.VOLT,
+  },
+};
diff --git a/server/services/tuya/lib/mappings/cloud/smart-socket.js b/server/services/tuya/lib/mappings/cloud/smart-socket.js
new file mode 100644
index 0000000000..71c6e4f2de
--- /dev/null
+++ b/server/services/tuya/lib/mappings/cloud/smart-socket.js
@@ -0,0 +1,53 @@
+const {
+  DEVICE_FEATURE_TYPES,
+  DEVICE_FEATURE_CATEGORIES,
+  DEVICE_FEATURE_UNITS,
+} = require('../../../../../utils/constants');
+
+module.exports = {
+  ignoredCodes: ['countdown', 'countdown_1'],
+  switch: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  power: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  switch_1: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  switch_2: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  switch_3: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  switch_4: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
+  },
+  add_ele: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.ENERGY,
+    unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
+  },
+  cur_current: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.CURRENT,
+    unit: DEVICE_FEATURE_UNITS.MILLI_AMPERE,
+  },
+  cur_power: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.POWER,
+    unit: DEVICE_FEATURE_UNITS.WATT,
+  },
+  cur_voltage: {
+    category: DEVICE_FEATURE_CATEGORIES.SWITCH,
+    type: DEVICE_FEATURE_TYPES.SWITCH.VOLTAGE,
+    unit: DEVICE_FEATURE_UNITS.VOLT,
+  },
+};
diff --git a/server/services/tuya/lib/mappings/index.js b/server/services/tuya/lib/mappings/index.js
new file mode 100644
index 0000000000..7f5cdcd49c
--- /dev/null
+++ b/server/services/tuya/lib/mappings/index.js
@@ -0,0 +1,235 @@
+const globalCloud = require('./cloud/global');
+const smartSocketCloud = require('./cloud/smart-socket');
+
+const globalLocal = require('./local/global');
+const smartSocketLocal = require('./local/smart-socket');
+
+const DEVICE_TYPES = {
+  SMART_SOCKET: 'smart-socket',
+  UNKNOWN: 'unknown',
+};
+
+const SWITCH_CODES = new Set(['switch', 'switch_1', 'switch_2', 'power']);
+
+const SMART_SOCKET = {
+  DEVICE_TYPE_NAME: DEVICE_TYPES.SMART_SOCKET,
+  CATEGORIES: new Set(['cz']),
+  PRODUCT_IDS: new Set(['cya3zxfd38g4qp8d']),
+  KEYWORDS: ['socket', 'plug', 'outlet', 'prise'],
+  REQUIRED_CODES: SWITCH_CODES,
+  CLOUD_MAPPINGS: smartSocketCloud,
+  LOCAL_MAPPINGS: smartSocketLocal,
+};
+
+const LIST_DEVICE_TYPES = [
+  SMART_SOCKET,
+];
+
+const normalizeCode = (code) => {
+  if (!code) {
+    return null;
+  }
+  return String(code).toLowerCase();
+};
+
+const normalizeStringSet = (setLike) =>
+  new Set(
+    Array.from(setLike || [])
+      .map((value) => normalizeCode(value))
+      .filter((value) => Boolean(value)),
+  );
+
+const DEVICE_TYPE_INDEX = LIST_DEVICE_TYPES.reduce((acc, definition) => {
+  const typeName = normalizeCode(definition && definition.DEVICE_TYPE_NAME);
+  if (!typeName) {
+    return acc;
+  }
+  acc[typeName] = {
+    ...definition,
+    CATEGORIES: normalizeStringSet(definition.CATEGORIES),
+    PRODUCT_IDS: normalizeStringSet(definition.PRODUCT_IDS),
+    KEYWORDS: Array.isArray(definition.KEYWORDS)
+      ? definition.KEYWORDS.map((keyword) => String(keyword).toLowerCase())
+      : [],
+    REQUIRED_CODES: normalizeStringSet(definition.REQUIRED_CODES),
+  };
+  return acc;
+}, {});
+
+const matchDeviceType = (typeDefinition, context) => {
+  const { category, productId, modelName, codes } = context;
+  if (!typeDefinition) {
+    return false;
+  }
+
+  if (category && typeDefinition.CATEGORIES.has(category)) {
+    return true;
+  }
+  if (productId && typeDefinition.PRODUCT_IDS.has(productId)) {
+    return true;
+  }
+
+  const requiredCodes = typeDefinition.REQUIRED_CODES;
+  const keywords = typeDefinition.KEYWORDS;
+
+  const hasRequiredCode = requiredCodes.size === 0 || Array.from(requiredCodes).some((code) => codes.has(code));
+  if (!hasRequiredCode || !modelName || keywords.length === 0) {
+    return false;
+  }
+
+  return keywords.some((keyword) => modelName.includes(keyword));
+};
+
+const getCloudMapping = (deviceType) => {
+  if (!deviceType || deviceType === DEVICE_TYPES.UNKNOWN) {
+    return { ...globalCloud };
+  }
+  const definition = DEVICE_TYPE_INDEX[normalizeCode(deviceType)];
+  if (definition && definition.CLOUD_MAPPINGS) {
+    return { ...definition.CLOUD_MAPPINGS };
+  }
+  return { ...globalCloud };
+};
+
+const getLocalMapping = (deviceType) => {
+  const normalizeLocalMapping = (mapping) => {
+    const current = mapping && typeof mapping === 'object' ? mapping : {};
+    return {
+      strict: current.strict === true,
+      codeAliases: { ...(current.codeAliases || {}) },
+      dps: { ...(current.dps || {}) },
+      ignoredDps: Array.from(
+        new Set((Array.isArray(current.ignoredDps) ? current.ignoredDps : []).map((value) => String(value))),
+      ),
+    };
+  };
+
+  if (!deviceType || deviceType === DEVICE_TYPES.UNKNOWN) {
+    return normalizeLocalMapping(globalLocal);
+  }
+  const definition = DEVICE_TYPE_INDEX[normalizeCode(deviceType)];
+  if (definition && definition.LOCAL_MAPPINGS) {
+    return normalizeLocalMapping(definition.LOCAL_MAPPINGS);
+  }
+  return normalizeLocalMapping(globalLocal);
+};
+
+const extractCodesFromSpecifications = (specifications) => {
+  const codes = new Set();
+  if (!specifications || typeof specifications !== 'object') {
+    return codes;
+  }
+  const functions = Array.isArray(specifications.functions) ? specifications.functions : [];
+  const status = Array.isArray(specifications.status) ? specifications.status : [];
+
+  [...functions, ...status].forEach((item) => {
+    if (!item || !item.code) {
+      return;
+    }
+    codes.add(String(item.code).toLowerCase());
+  });
+
+  return codes;
+};
+
+const extractCodesFromFeatures = (features) => {
+  const codes = new Set();
+  if (!Array.isArray(features)) {
+    return codes;
+  }
+
+  features.forEach((feature) => {
+    if (!feature || !feature.external_id) {
+      return;
+    }
+    const parts = String(feature.external_id).split(':');
+    if (parts.length >= 3) {
+      const code = parts[2];
+      if (code) {
+        codes.add(String(code).toLowerCase());
+      }
+    }
+  });
+
+  return codes;
+};
+
+const getDeviceType = (device) => {
+  if (!device || typeof device !== 'object') {
+    return DEVICE_TYPES.UNKNOWN;
+  }
+
+  const specifications = device.specifications || {};
+  let codes = extractCodesFromSpecifications(specifications);
+  if (codes.size === 0) {
+    codes = extractCodesFromFeatures(device.features);
+  }
+
+  const modelName = [device.model, device.product_name, device.name]
+    .filter((value) => typeof value === 'string' && value.length > 0)
+    .join(' ')
+    .toLowerCase();
+  const category = normalizeCode(specifications.category || device.category);
+  const productId = normalizeCode(device.product_id);
+  const context = {
+    codes,
+    modelName,
+    category,
+    productId,
+  };
+
+  const matchedType = Object.values(DEVICE_TYPE_INDEX).find((typeDefinition) =>
+    matchDeviceType(typeDefinition, context),
+  );
+  if (matchedType && matchedType.DEVICE_TYPE_NAME) {
+    return matchedType.DEVICE_TYPE_NAME;
+  }
+
+  return DEVICE_TYPES.UNKNOWN;
+};
+
+const getFeatureMapping = (code, deviceType) => {
+  const normalized = normalizeCode(code);
+  if (!normalized) {
+    return null;
+  }
+  const mapping = getCloudMapping(deviceType);
+  const candidate = mapping[normalized];
+
+  if (!candidate || typeof candidate !== 'object') {
+    return null;
+  }
+  if (!candidate.category || !candidate.type) {
+    return null;
+  }
+
+  return candidate;
+};
+
+const getIgnoredLocalDps = (deviceType) => {
+  const { ignoredDps } = getLocalMapping(deviceType);
+  return Array.isArray(ignoredDps) ? ignoredDps : [];
+};
+
+const getIgnoredCloudCodes = (deviceType) => {
+  const mapping = getCloudMapping(deviceType);
+  const ignored = Array.isArray(mapping.ignoredCodes) ? mapping.ignoredCodes : [];
+  const normalized = ignored
+    .filter((value) => value !== null && value !== undefined)
+    .map((value) => String(value).toLowerCase());
+
+  return Array.from(new Set(normalized));
+};
+
+module.exports = {
+  DEVICE_TYPES,
+  extractCodesFromSpecifications,
+  extractCodesFromFeatures,
+  getCloudMapping,
+  getLocalMapping,
+  getFeatureMapping,
+  getIgnoredLocalDps,
+  getIgnoredCloudCodes,
+  getDeviceType,
+  normalizeCode,
+};
diff --git a/server/services/tuya/lib/mappings/local/global.js b/server/services/tuya/lib/mappings/local/global.js
new file mode 100644
index 0000000000..b83276f9bf
--- /dev/null
+++ b/server/services/tuya/lib/mappings/local/global.js
@@ -0,0 +1,11 @@
+module.exports = {
+  strict: false,
+  codeAliases: {
+    switch: ['power'],
+    power: ['switch'],
+  },
+  dps: {
+    switch: 1,
+    power: 1,
+  },
+};
diff --git a/server/services/tuya/lib/mappings/local/smart-socket.js b/server/services/tuya/lib/mappings/local/smart-socket.js
new file mode 100644
index 0000000000..641976b01a
--- /dev/null
+++ b/server/services/tuya/lib/mappings/local/smart-socket.js
@@ -0,0 +1,20 @@
+module.exports = {
+  strict: true,
+  ignoredDps: ['11'],
+  codeAliases: {
+    switch: ['power'],
+    power: ['switch'],
+    switch_1: ['switch', 'power'],
+    switch_2: ['switch'],
+    switch_3: ['switch'],
+    switch_4: ['switch'],
+  },
+  dps: {
+    switch: 1,
+    power: 1,
+    switch_1: 1,
+    switch_2: 2,
+    switch_3: 3,
+    switch_4: 4,
+  },
+};
diff --git a/server/services/tuya/lib/tuya.localPoll.js b/server/services/tuya/lib/tuya.localPoll.js
index 840c064119..82fd9c373b 100644
--- a/server/services/tuya/lib/tuya.localPoll.js
+++ b/server/services/tuya/lib/tuya.localPoll.js
@@ -5,6 +5,7 @@ const { BadParameters } = require('../../../utils/coreErrors');
 const { mergeDevices } = require('../../../utils/device');
 const { DEVICE_PARAM_NAME } = require('./utils/tuya.constants');
 const { normalizeExistingDevice, upsertParam } = require('./utils/tuya.deviceParams');
+const { addFallbackBinaryFeature } = require('./device/tuya.localMapping');
 
 /**
  * @description Poll a Tuya device locally to retrieve DPS map.
@@ -14,7 +15,7 @@ const { normalizeExistingDevice, upsertParam } = require('./utils/tuya.devicePar
  * await localPoll({ deviceId: 'id', ip: '1.1.1.1', localKey: 'key', protocolVersion: '3.3' });
  */
 async function localPoll(payload) {
-  const { deviceId, ip, localKey, protocolVersion, timeoutMs = 3000, fastScan = false } = payload || {};
+  const { deviceId, ip, localKey, protocolVersion, timeoutMs = 3000, fastScan = false, logDps = true } = payload || {};
   const isProtocol35 = protocolVersion === '3.5';
   const effectiveTimeout = isProtocol35 && !fastScan ? Math.max(timeoutMs, 5000) : timeoutMs;
   const TuyaLocalApi = isProtocol35 ? TuyAPINewGen : TuyAPI;
@@ -110,7 +111,9 @@ async function localPoll(payload) {
         typeof data === 'string' ? `Invalid local poll response: ${data}` : 'Invalid local poll response';
       throw new BadParameters(errorMessage);
     }
-    logger.debug(`[Tuya][localPoll] device=${deviceId} dps=${JSON.stringify(data)}`);
+    if (logDps) {
+      logger.debug(`[Tuya][localPoll] device=${deviceId} dps=${JSON.stringify(data)}`);
+    }
     tuyaLocal.removeListener('error', onError);
     return data;
   } catch (e) {
@@ -137,7 +140,7 @@ async function localPoll(payload) {
  * updateDiscoveredDeviceAfterLocalPoll(tuyaManager, { deviceId: 'id', ip: '1.1.1.1', protocolVersion: '3.3' });
  */
 function updateDiscoveredDeviceAfterLocalPoll(tuyaManager, payload) {
-  const { deviceId, ip, protocolVersion, localKey } = payload || {};
+  const { deviceId, ip, protocolVersion, localKey, dps } = payload || {};
   if (!deviceId || !tuyaManager || !Array.isArray(tuyaManager.discoveredDevices)) {
     return null;
   }
@@ -162,6 +165,8 @@ function updateDiscoveredDeviceAfterLocalPoll(tuyaManager, payload) {
   upsertParam(device.params, DEVICE_PARAM_NAME.PRODUCT_ID, device.product_id);
   upsertParam(device.params, DEVICE_PARAM_NAME.PRODUCT_KEY, device.product_key);
 
+  device = addFallbackBinaryFeature(device, dps);
+
   if (tuyaManager.gladys && tuyaManager.gladys.stateManager) {
     const existing = normalizeExistingDevice(
       tuyaManager.gladys.stateManager.get('deviceByExternalId', device.external_id),
diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index a3d084201e..621b861df2 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -1,7 +1,157 @@
 const { BadParameters } = require('../../../utils/coreErrors');
+const logger = require('../../../utils/logger');
 const { readValues } = require('./device/tuya.deviceMapping');
-const { API } = require('./utils/tuya.constants');
+const { API, DEVICE_PARAM_NAME } = require('./utils/tuya.constants');
 const { EVENTS } = require('../../../utils/constants');
+const { normalizeBoolean } = require('./utils/tuya.normalize');
+const { getParamValue } = require('./utils/tuya.deviceParams');
+const { localPoll } = require('./tuya.localPoll');
+const { getLocalDpsFromCode } = require('./device/tuya.localMapping');
+
+const SAME_VALUE_EMIT_INTERVAL_MS = 3 * 60 * 1000;
+
+const getFeatureCode = (deviceFeature) => {
+  if (!deviceFeature || !deviceFeature.external_id) {
+    return null;
+  }
+  const parts = String(deviceFeature.external_id).split(':');
+  if (parts.length >= 2) {
+    return parts[parts.length - 1] || null;
+  }
+  return null;
+};
+
+const getFeatureReader = (deviceFeature) => {
+  if (!deviceFeature || !deviceFeature.category || !deviceFeature.type) {
+    return null;
+  }
+  const categoryReaders = readValues[deviceFeature.category];
+  if (!categoryReaders) {
+    return null;
+  }
+  return categoryReaders[deviceFeature.type] || null;
+};
+
+const hasDpsKey = (dps, key) => {
+  if (!dps || typeof dps !== 'object') {
+    return false;
+  }
+  const stringKey = String(key);
+  return Object.prototype.hasOwnProperty.call(dps, stringKey) || Object.prototype.hasOwnProperty.call(dps, key);
+};
+
+const getCurrentFeatureState = (gladys, deviceFeature) => {
+  const selector = deviceFeature && deviceFeature.selector;
+  if (selector && gladys && gladys.stateManager && typeof gladys.stateManager.get === 'function') {
+    const currentFeature = gladys.stateManager.get('deviceFeature', selector);
+    if (currentFeature) {
+      return {
+        lastValue: Object.prototype.hasOwnProperty.call(currentFeature, 'last_value')
+          ? currentFeature.last_value
+          : deviceFeature && deviceFeature.last_value,
+        lastValueChanged: Object.prototype.hasOwnProperty.call(currentFeature, 'last_value_changed')
+          ? currentFeature.last_value_changed
+          : deviceFeature && deviceFeature.last_value_changed,
+      };
+    }
+  }
+  return {
+    lastValue: deviceFeature ? deviceFeature.last_value : undefined,
+    lastValueChanged: deviceFeature ? deviceFeature.last_value_changed : undefined,
+  };
+};
+
+const toTimestamp = (value) => {
+  if (value === undefined || value === null) {
+    return null;
+  }
+  const date = value instanceof Date ? value : new Date(value);
+  const timestamp = date.getTime();
+  if (Number.isNaN(timestamp)) {
+    return null;
+  }
+  return timestamp;
+};
+
+const emitFeatureState = (gladys, deviceFeature, transformedValue, previousValue, previousValueChangedAt) => {
+  if (transformedValue === null || transformedValue === undefined) {
+    return { emitted: false, changed: false };
+  }
+
+  const changed = previousValue !== transformedValue;
+  let emitted = changed;
+
+  if (!emitted) {
+    const lastValueChangedTs = toTimestamp(previousValueChangedAt);
+    const now = Date.now();
+    if (lastValueChangedTs === null || now - lastValueChangedTs >= SAME_VALUE_EMIT_INTERVAL_MS) {
+      emitted = true;
+    }
+  }
+
+  if (emitted) {
+    gladys.event.emit(EVENTS.DEVICE.NEW_STATE, {
+      device_feature_external_id: deviceFeature.external_id,
+      state: transformedValue,
+    });
+  }
+
+  return { emitted, changed };
+};
+
+const pollCloudFeatures = async function pollCloudFeatures(deviceFeatures, topic) {
+  const summary = {
+    polled: Array.isArray(deviceFeatures) ? deviceFeatures.length : 0,
+    handled: 0,
+    changed: 0,
+    missing: 0,
+    skipped: 0,
+  };
+
+  if (!this.connector || typeof this.connector.request !== 'function') {
+    logger.warn(`[Tuya][poll][cloud] connector unavailable for device=${topic}`);
+    return summary;
+  }
+
+  const response = await this.connector.request({
+    method: 'GET',
+    path: `${API.VERSION_1_0}/devices/${topic}/status`,
+  });
+
+  const values = {};
+  (response.result || []).forEach((feature) => {
+    values[feature.code] = feature.value;
+  });
+
+  deviceFeatures.forEach((deviceFeature) => {
+    const code = getFeatureCode(deviceFeature);
+    if (!code) {
+      summary.skipped += 1;
+      return;
+    }
+
+    const reader = getFeatureReader(deviceFeature);
+    if (!reader) {
+      summary.skipped += 1;
+      return;
+    }
+
+    const value = values[code];
+    if (value === undefined) {
+      summary.missing += 1;
+      return;
+    }
+    const transformedValue = reader(value, deviceFeature);
+    const { lastValue, lastValueChanged } = getCurrentFeatureState(this.gladys, deviceFeature);
+    const { changed } = emitFeatureState(this.gladys, deviceFeature, transformedValue, lastValue, lastValueChanged);
+    if (changed) {
+      summary.changed += 1;
+    }
+    summary.handled += 1;
+  });
+
+  return summary;
+};
 
 /**
  *
@@ -22,31 +172,119 @@ async function poll(device) {
     throw new BadParameters(`Tuya device external_id is invalid: "${externalId}" have no network indicator`);
   }
 
-  const response = await this.connector.request({
-    method: 'GET',
-    path: `${API.VERSION_1_0}/devices/${topic}/status`,
-  });
+  const params = device.params || [];
+  const ipAddress = getParamValue(params, DEVICE_PARAM_NAME.IP_ADDRESS);
+  const localKey = getParamValue(params, DEVICE_PARAM_NAME.LOCAL_KEY);
+  const protocolVersionRaw = getParamValue(params, DEVICE_PARAM_NAME.PROTOCOL_VERSION);
+  const protocolVersion =
+    protocolVersionRaw !== null && protocolVersionRaw !== undefined ? String(protocolVersionRaw).trim() : undefined;
+  const localOverride = normalizeBoolean(getParamValue(params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE));
+  const hasLocalConfig = Boolean(ipAddress && localKey && protocolVersion && localOverride === true);
+  const requestedMode = localOverride === true ? 'local' : 'cloud';
+  logger.debug(
+    `[Tuya][poll] device=${topic} requested=${requestedMode} has_local=${Boolean(hasLocalConfig)} protocol=${
+      protocolVersion || 'none'
+    } ip=${ipAddress || 'none'}`,
+  );
 
-  const values = {};
-  (response.result || []).forEach((feature) => {
-    values[feature.code] = feature.value;
-  });
+  let modeUsed = 'cloud';
+  let localHandled = 0;
+  let localChanged = 0;
+  let cloudSummary = {
+    polled: 0,
+    handled: 0,
+    changed: 0,
+    missing: 0,
+    skipped: 0,
+  };
+  let fallbackReason = 'none';
+
+  if (localOverride === true && !hasLocalConfig) {
+    fallbackReason = 'incomplete_local_config';
+    logger.warn(
+      `[Tuya][poll] local mode enabled but config is incomplete for device=${topic} (ip/protocol/local_key missing)`,
+    );
+  }
 
-  device.features.forEach((deviceFeature) => {
-    const [, , code] = deviceFeature.external_id.split(':');
+  if (hasLocalConfig) {
+    try {
+      const localResult = await localPoll({
+        deviceId: topic,
+        ip: ipAddress,
+        localKey,
+        protocolVersion,
+        timeoutMs: 3000,
+        fastScan: true,
+        logDps: false,
+      });
 
-    const value = values[code];
-    const transformedValue = readValues[deviceFeature.category][deviceFeature.type](value);
+      const dps = localResult && localResult.dps ? localResult.dps : null;
+      if (dps && typeof dps === 'object') {
+        const pendingCloudFeatures = [];
+
+        device.features.forEach((deviceFeature) => {
+          const code = getFeatureCode(deviceFeature);
+          const dpsKey = getLocalDpsFromCode(code, device);
+          const reader = getFeatureReader(deviceFeature);
 
-    if (deviceFeature.last_value !== transformedValue) {
-      if (transformedValue !== null && transformedValue !== undefined) {
-        this.gladys.event.emit(EVENTS.DEVICE.NEW_STATE, {
-          device_feature_external_id: deviceFeature.external_id,
-          state: transformedValue,
+          if (!code || dpsKey === null || !reader || !hasDpsKey(dps, dpsKey)) {
+            pendingCloudFeatures.push(deviceFeature);
+            return;
+          }
+
+          const rawValue = Object.prototype.hasOwnProperty.call(dps, String(dpsKey))
+            ? dps[String(dpsKey)]
+            : dps[dpsKey];
+          if (rawValue === undefined) {
+            pendingCloudFeatures.push(deviceFeature);
+            return;
+          }
+          const transformedValue = reader(rawValue, deviceFeature);
+          const { lastValue, lastValueChanged } = getCurrentFeatureState(this.gladys, deviceFeature);
+          const { changed } = emitFeatureState(
+            this.gladys,
+            deviceFeature,
+            transformedValue,
+            lastValue,
+            lastValueChanged,
+          );
+          if (changed) {
+            localChanged += 1;
+          }
+          localHandled += 1;
         });
+
+        if (pendingCloudFeatures.length === 0) {
+          modeUsed = 'local';
+          logger.debug(
+            `[Tuya][poll] device=${topic} mode=${modeUsed} local_handled=${localHandled} local_changed=${localChanged} cloud_handled=0 cloud_changed=0 cloud_missing=0 fallback=${fallbackReason}`,
+          );
+          return;
+        }
+
+        fallbackReason = 'partial_local_mapping';
+        try {
+          cloudSummary = await pollCloudFeatures.call(this, pendingCloudFeatures, topic);
+        } catch (e) {
+          logger.warn(`[Tuya][poll] local poll succeeded but cloud fallback failed for ${topic}`, e);
+          fallbackReason = 'cloud_fallback_failed';
+        }
+        modeUsed = 'local+cloud';
+        logger.debug(
+          `[Tuya][poll] device=${topic} mode=${modeUsed} local_handled=${localHandled} local_changed=${localChanged} cloud_handled=${cloudSummary.handled} cloud_changed=${cloudSummary.changed} cloud_missing=${cloudSummary.missing} fallback=${fallbackReason}`,
+        );
+        return;
       }
+    } catch (e) {
+      logger.warn(`[Tuya][poll] local poll failed for ${topic}, falling back to cloud`, e);
+      fallbackReason = 'local_poll_failed';
     }
-  });
+  }
+
+  cloudSummary = await pollCloudFeatures.call(this, device.features, topic);
+  logger.debug(
+    `[Tuya][poll] device=${topic} mode=${modeUsed} local_handled=${localHandled} local_changed=${localChanged} cloud_handled=${cloudSummary.handled} cloud_changed=${cloudSummary.changed} cloud_missing=${cloudSummary.missing} fallback=${fallbackReason}`,
+  );
 }
 
 module.exports = {
diff --git a/server/services/tuya/lib/tuya.setValue.js b/server/services/tuya/lib/tuya.setValue.js
index 4103f8a38a..b78a266f7f 100644
--- a/server/services/tuya/lib/tuya.setValue.js
+++ b/server/services/tuya/lib/tuya.setValue.js
@@ -6,25 +6,8 @@ const { BadParameters } = require('../../../utils/coreErrors');
 const { writeValues } = require('./device/tuya.deviceMapping');
 const { DEVICE_PARAM_NAME } = require('./utils/tuya.constants');
 const { normalizeBoolean } = require('./utils/tuya.normalize');
-
-const getParamValue = (params, name) => {
-  const found = (params || []).find((param) => param.name === name);
-  return found ? found.value : undefined;
-};
-
-const getLocalDpsFromCode = (code) => {
-  if (!code) {
-    return null;
-  }
-  if (code === 'switch') {
-    return 1;
-  }
-  const match = code.match(/_(\d+)$/);
-  if (match) {
-    return parseInt(match[1], 10);
-  }
-  return null;
-};
+const { getParamValue } = require('./utils/tuya.deviceParams');
+const { getLocalDpsFromCode } = require('./device/tuya.localMapping');
 
 /**
  * @description Send the new device value over device protocol.
@@ -53,12 +36,14 @@ async function setValue(device, deviceFeature, value) {
   const params = device.params || [];
   const ipAddress = getParamValue(params, DEVICE_PARAM_NAME.IP_ADDRESS);
   const localKey = getParamValue(params, DEVICE_PARAM_NAME.LOCAL_KEY);
-  const protocolVersion = getParamValue(params, DEVICE_PARAM_NAME.PROTOCOL_VERSION);
+  const protocolVersionRaw = getParamValue(params, DEVICE_PARAM_NAME.PROTOCOL_VERSION);
+  const protocolVersion =
+    protocolVersionRaw !== null && protocolVersionRaw !== undefined ? String(protocolVersionRaw).trim() : undefined;
   const localOverride = normalizeBoolean(getParamValue(params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE));
 
   const hasLocalConfig = ipAddress && localKey && protocolVersion && localOverride === true;
 
-  const localDps = getLocalDpsFromCode(command);
+  const localDps = getLocalDpsFromCode(command, device);
 
   if (hasLocalConfig && localDps !== null) {
     const isProtocol35 = protocolVersion === '3.5';
diff --git a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
index d3a03c9bbd..86600432ce 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
@@ -1,6 +1,7 @@
 const { expect } = require('chai');
 
 const { convertFeature } = require('../../../../../../services/tuya/lib/device/tuya.convertFeature');
+const { DEVICE_TYPES } = require('../../../../../../services/tuya/lib/mappings');
 
 describe('Tuya convert feature', () => {
   it('should return undefined when code not exist', () => {
@@ -55,4 +56,22 @@ describe('Tuya convert feature', () => {
       type: 'binary',
     });
   });
+
+  it('should ignore cloud codes flagged in mapping', () => {
+    const result = convertFeature(
+      {
+        code: 'countdown',
+        type: 'Integer',
+        name: 'countdown',
+        readOnly: true,
+        values: '{}',
+      },
+      'externalId',
+      {
+        deviceType: DEVICE_TYPES.SMART_SOCKET,
+      },
+    );
+
+    expect(result).to.equal(undefined);
+  });
 });
diff --git a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
index ad1c7a6c4f..4884c05036 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
@@ -55,6 +55,10 @@ describe('Tuya device mapping', () => {
       const result = readValues[DEVICE_FEATURE_CATEGORIES.LIGHT][DEVICE_FEATURE_TYPES.LIGHT.BINARY](true);
       expect(result).to.eq(1);
     });
+    it('light binary string', () => {
+      const result = readValues[DEVICE_FEATURE_CATEGORIES.LIGHT][DEVICE_FEATURE_TYPES.LIGHT.BINARY]('true');
+      expect(result).to.eq(1);
+    });
     it('light brightness', () => {
       const result = readValues[DEVICE_FEATURE_CATEGORIES.LIGHT][DEVICE_FEATURE_TYPES.LIGHT.BRIGHTNESS](50);
       expect(result).to.eq(50);
@@ -74,6 +78,14 @@ describe('Tuya device mapping', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.BINARY](true);
         expect(result).to.eq(1);
       });
+      it('switch number', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.BINARY](1);
+        expect(result).to.eq(1);
+      });
+      it('switch string false', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.BINARY]('false');
+        expect(result).to.eq(0);
+      });
       it('switch string on', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.BINARY]('ON');
         expect(result).to.eq(1);
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
index ff9b155ea3..f5cc9b7b34 100644
--- a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
@@ -2,6 +2,8 @@ const { expect } = require('chai');
 
 const { convertDevice } = require('../../../../../services/tuya/lib/device/tuya.convertDevice');
 const { DEVICE_PARAM_NAME } = require('../../../../../services/tuya/lib/utils/tuya.constants');
+const { DEVICE_TYPES } = require('../../../../../services/tuya/lib/mappings');
+const { DEVICE_POLL_FREQUENCIES } = require('../../../../../utils/constants');
 
 describe('tuya.convertDevice', () => {
   it('should map params and features with optional fields', () => {
@@ -30,6 +32,7 @@ describe('tuya.convertDevice', () => {
 
     expect(device.product_id).to.equal('product-id');
     expect(device.product_key).to.equal('product-key');
+    expect(device.device_type).to.equal(DEVICE_TYPES.SMART_SOCKET);
     expect(device.online).to.equal(true);
     expect(device.features.length).to.equal(2);
     expect(device.properties).to.deep.equal({ properties: [{ code: 'foo', value: 'bar' }] });
@@ -39,6 +42,11 @@ describe('tuya.convertDevice', () => {
       functions: [{ code: 'switch_1', name: 'Switch', type: 'Boolean' }],
       status: [{ code: 'cur_power', name: 'Power', type: 'Integer' }],
     });
+    expect(device.tuya_mapping).to.deep.equal({
+      ignored_local_dps: ['11'],
+      ignored_cloud_codes: ['countdown', 'countdown_1'],
+    });
+    expect(device.poll_frequency).to.equal(DEVICE_POLL_FREQUENCIES.EVERY_10_SECONDS);
 
     const params = device.params.reduce((acc, param) => {
       acc[param.name] = param.value;
@@ -68,8 +76,10 @@ describe('tuya.convertDevice', () => {
 
     expect(device.product_id).to.equal(undefined);
     expect(device.product_key).to.equal(undefined);
+    expect(device.device_type).to.equal(DEVICE_TYPES.UNKNOWN);
     expect(device.online).to.equal(false);
     expect(device.features.length).to.equal(0);
     expect(device.specifications).to.deep.equal({});
+    expect(device.poll_frequency).to.equal(DEVICE_POLL_FREQUENCIES.EVERY_30_SECONDS);
   });
 });
diff --git a/server/test/services/tuya/lib/device/tuya.localMapping.test.js b/server/test/services/tuya/lib/device/tuya.localMapping.test.js
new file mode 100644
index 0000000000..f898787081
--- /dev/null
+++ b/server/test/services/tuya/lib/device/tuya.localMapping.test.js
@@ -0,0 +1,92 @@
+/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */
+const { expect } = require('chai');
+
+const proxyquire = require('proxyquire')
+  .noCallThru()
+  .noPreserveCache();
+
+const {
+  addFallbackBinaryFeature,
+  getLocalDpsFromCode,
+} = require('../../../../../services/tuya/lib/device/tuya.localMapping');
+
+describe('Tuya local mapping', () => {
+  it('should return device when device is null', () => {
+    const result = addFallbackBinaryFeature(null, { 1: true });
+    expect(result).to.equal(null);
+  });
+
+  it('should return device when external_id is missing', () => {
+    const device = { name: 'Device' };
+    const result = addFallbackBinaryFeature(device, { 1: true });
+    expect(result).to.equal(device);
+  });
+
+  it('should resolve aliases in strict local mapping', () => {
+    const device = { device_type: 'smart-socket' };
+    const dpsKey = getLocalDpsFromCode('power', device);
+    expect(dpsKey).to.equal(1);
+  });
+
+  it('should resolve switch_1 in strict local mapping', () => {
+    const device = { device_type: 'smart-socket' };
+    const dpsKey = getLocalDpsFromCode('switch_1', device);
+    expect(dpsKey).to.equal(1);
+  });
+
+  it('should resolve aliases when direct dps is missing', () => {
+    const { getLocalDpsFromCode: getLocalDpsFromCodeStub } = proxyquire(
+      '../../../../../services/tuya/lib/device/tuya.localMapping',
+      {
+        '../mappings': {
+          getDeviceType: () => 'unknown',
+          getLocalMapping: () => ({
+            strict: true,
+            codeAliases: { foo: ['bar'] },
+            dps: { bar: 7 },
+          }),
+          normalizeCode: (code) => (code ? String(code).toLowerCase() : null),
+        },
+        './tuya.convertFeature': { convertFeature: () => null },
+      },
+    );
+
+    const dpsKey = getLocalDpsFromCodeStub('foo', {});
+    expect(dpsKey).to.equal(7);
+  });
+
+  it('should return null for unknown code in strict local mapping', () => {
+    const device = { device_type: 'smart-socket' };
+    const dpsKey = getLocalDpsFromCode('unknown_code', device);
+    expect(dpsKey).to.equal(null);
+  });
+
+  it('should fallback to switch dps in non-strict mapping without dps', () => {
+    const { getLocalDpsFromCode: getLocalDpsFromCodeStub } = proxyquire(
+      '../../../../../services/tuya/lib/device/tuya.localMapping',
+      {
+        '../mappings': {
+          getDeviceType: () => 'unknown',
+          getLocalMapping: () => ({ strict: false, codeAliases: {}, dps: {} }),
+          normalizeCode: (code) => (code ? String(code).toLowerCase() : null),
+        },
+        './tuya.convertFeature': { convertFeature: () => null },
+      },
+    );
+    const dpsKey = getLocalDpsFromCodeStub('switch', {});
+    expect(dpsKey).to.equal(1);
+  });
+
+  it('should add fallback binary feature when no features and dps 1 exists', () => {
+    const device = {
+      external_id: 'tuya:device',
+      features: [],
+      device_type: 'smart-socket',
+    };
+
+    const result = addFallbackBinaryFeature(device, { 1: true });
+
+    expect(result.features).to.have.length(1);
+    expect(result.features[0].external_id).to.equal('tuya:device:switch_1');
+  });
+});
diff --git a/server/test/services/tuya/lib/mappings/index.test.js b/server/test/services/tuya/lib/mappings/index.test.js
new file mode 100644
index 0000000000..9d05f059cc
--- /dev/null
+++ b/server/test/services/tuya/lib/mappings/index.test.js
@@ -0,0 +1,110 @@
+/* eslint-disable require-jsdoc, jsdoc/require-jsdoc */
+const { expect } = require('chai');
+const proxyquire = require('proxyquire').noCallThru();
+
+const mappings = require('../../../../../services/tuya/lib/mappings');
+
+const {
+  DEVICE_TYPES,
+  extractCodesFromSpecifications,
+  extractCodesFromFeatures,
+  getCloudMapping,
+  getLocalMapping,
+  getFeatureMapping,
+  getIgnoredLocalDps,
+  getIgnoredCloudCodes,
+  getDeviceType,
+  normalizeCode,
+} = mappings;
+
+describe('Tuya mappings index', () => {
+  it('should normalize codes', () => {
+    expect(normalizeCode()).to.equal(null);
+    expect(normalizeCode('TeSt')).to.equal('test');
+  });
+
+  it('should extract codes from specifications and skip invalid entries', () => {
+    const empty = extractCodesFromSpecifications(null);
+    expect(empty.size).to.equal(0);
+
+    const codes = extractCodesFromSpecifications({
+      functions: [{ code: 'Switch' }, {}],
+      status: [{ code: 'CUR_POWER' }, { code: null }],
+    });
+    expect(Array.from(codes)).to.have.members(['switch', 'cur_power']);
+  });
+
+  it('should extract codes from features', () => {
+    const empty = extractCodesFromFeatures(null);
+    expect(empty.size).to.equal(0);
+
+    const codes = extractCodesFromFeatures([{}, { external_id: 'tuya:device:switch' }, { external_id: 'tuya:device' }]);
+    expect(codes.has('switch')).to.equal(true);
+    expect(codes.size).to.equal(1);
+  });
+
+  it('should build cloud and local mappings', () => {
+    const cloud = getCloudMapping(DEVICE_TYPES.SMART_SOCKET);
+    expect(cloud.switch).to.be.an('object');
+    expect(cloud.cur_power).to.be.an('object');
+    expect(cloud.switch_led).to.equal(undefined);
+    const unknownCloud = getCloudMapping(DEVICE_TYPES.UNKNOWN);
+    expect(unknownCloud.switch_led).to.be.an('object');
+
+    const local = getLocalMapping(DEVICE_TYPES.SMART_SOCKET);
+    expect(local.strict).to.equal(true);
+    expect(local.dps.switch).to.equal(1);
+    expect(local.ignoredDps).to.include('11');
+    const unknownLocal = getLocalMapping(DEVICE_TYPES.UNKNOWN);
+    expect(unknownLocal.strict).to.equal(false);
+    expect(unknownLocal.ignoredDps).to.not.include('11');
+  });
+
+  it('should detect device types', () => {
+    expect(getDeviceType(null)).to.equal(DEVICE_TYPES.UNKNOWN);
+
+    const socketByCategory = getDeviceType({
+      specifications: { category: 'cz', functions: [], status: [] },
+      model: '',
+      features: [],
+    });
+    expect(socketByCategory).to.equal(DEVICE_TYPES.SMART_SOCKET);
+
+    const socketByCodesAndName = getDeviceType({
+      specifications: {
+        functions: [{ code: 'switch_1' }],
+        status: [],
+      },
+      model: 'Wifi Plug Mini',
+    });
+    expect(socketByCodesAndName).to.equal(DEVICE_TYPES.SMART_SOCKET);
+
+    const socketByProductId = getDeviceType({
+      specifications: { functions: [], status: [] },
+      product_id: 'cya3zxfd38g4qp8d',
+    });
+    expect(socketByProductId).to.equal(DEVICE_TYPES.SMART_SOCKET);
+  });
+
+  it('should get feature mapping and ignore invalid candidates', () => {
+    expect(getFeatureMapping(null, DEVICE_TYPES.SMART_SOCKET)).to.equal(null);
+    expect(getFeatureMapping('unknown_code', DEVICE_TYPES.SMART_SOCKET)).to.equal(null);
+
+    const { getFeatureMapping: getFeatureMappingStub } = proxyquire('../../../../../services/tuya/lib/mappings', {
+      './cloud/global': { bad_code: { category: 'switch' } },
+      './cloud/smart-socket': {},
+      './local/global': {},
+      './local/smart-socket': {},
+    });
+    expect(getFeatureMappingStub('bad_code')).to.equal(null);
+  });
+
+  it('should expose ignored dps and cloud codes', () => {
+    expect(getIgnoredLocalDps(DEVICE_TYPES.SMART_SOCKET)).to.include('11');
+    const ignoredCloud = getIgnoredCloudCodes(DEVICE_TYPES.SMART_SOCKET);
+    expect(ignoredCloud).to.include('countdown');
+    expect(ignoredCloud).to.include('countdown_1');
+    const ignoredCloudUnknown = getIgnoredCloudCodes(DEVICE_TYPES.UNKNOWN);
+    expect(ignoredCloudUnknown).to.not.include('countdown');
+  });
+});
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index 2c5a6fb9a1..5c374e9503 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -161,6 +161,7 @@ describe('TuyaHandler.discoverDevices', () => {
             type: 'binary',
           },
         ],
+        device_type: 'smart-socket',
         model: 'model',
         name: 'name',
         poll_frequency: 30000,
@@ -211,6 +212,10 @@ describe('TuyaHandler.discoverDevices', () => {
         thing_model: {
           services: [],
         },
+        tuya_mapping: {
+          ignored_cloud_codes: ['countdown', 'countdown_1'],
+          ignored_local_dps: ['11'],
+        },
         online: true,
       },
     ]);
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index 1fad264df5..232872ee41 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -169,7 +169,14 @@ describe('TuyaHandler.localPoll', () => {
         timeoutMs: 1000,
       });
       // Attach handler immediately to avoid PromiseRejectionHandledWarning with fake timers.
-      const errorPromise = promise.catch((error) => error);
+      const errorPromise = (async () => {
+        try {
+          await promise;
+        } catch (error) {
+          return error;
+        }
+        return null;
+      })();
       await clock.tickAsync(1100);
       const error = await errorPromise;
       expect(error).to.be.instanceOf(BadParameters);
@@ -359,4 +366,26 @@ describe('TuyaHandler.updateDiscoveredDeviceAfterLocalPoll', () => {
     expect(updated).to.have.property('updatable');
     expect(updated.local_override).to.equal(true);
   });
+
+  it('should add fallback binary feature when dps includes key 1', () => {
+    const tuyaManager = {
+      discoveredDevices: [
+        {
+          external_id: 'tuya:device1',
+          params: [],
+          features: [],
+        },
+      ],
+    };
+
+    const updated = updateDiscoveredDeviceAfterLocalPoll(tuyaManager, {
+      deviceId: 'device1',
+      ip: '1.1.1.1',
+      protocolVersion: '3.3',
+      dps: { 1: true },
+    });
+
+    expect(updated.features).to.have.length(1);
+    expect(updated.features[0].external_id).to.equal('tuya:device1:switch_1');
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index a04fe1883a..371f79ee07 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -35,7 +35,12 @@ describe('TuyaHandler.poll', () => {
       request: sinon
         .stub()
         .onFirstCall()
-        .resolves({ result: [{ code: 'code', value: true }], total: 1, has_more: true, last_row_key: 'next' }),
+        .resolves({
+          result: [{ code: 'switch_1', value: true }],
+          total: 1,
+          has_more: true,
+          last_row_key: 'next',
+        }),
     };
   });
 
@@ -84,7 +89,7 @@ describe('TuyaHandler.poll', () => {
       external_id: 'tuya:device',
       features: [
         {
-          external_id: 'tuya:feature',
+          external_id: 'tuya:device:switch_1',
           category: 'light',
           type: 'binary',
         },
@@ -99,8 +104,236 @@ describe('TuyaHandler.poll', () => {
 
     assert.callCount(gladys.event.emit, 1);
     assert.calledWith(gladys.event.emit, EVENTS.DEVICE.NEW_STATE, {
-      device_feature_external_id: 'tuya:feature',
-      state: 0,
+      device_feature_external_id: 'tuya:device:switch_1',
+      state: 1,
     });
   });
+
+  it('should skip cloud feature when code is missing from payload', async () => {
+    await tuyaHandler.poll({
+      external_id: 'tuya:device',
+      features: [
+        {
+          external_id: 'tuya:device:missing_code',
+          category: 'light',
+          type: 'binary',
+        },
+      ],
+    });
+
+    assert.callCount(gladys.event.emit, 0);
+  });
+});
+
+describe('TuyaHandler.poll with local mapping', () => {
+  it('should use local dps and skip cloud when all features are mapped', async () => {
+    const localPoll = sinon.stub().resolves({ dps: { 1: true } });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+    });
+
+    const context = {
+      connector: {
+        request: sinon.stub(),
+      },
+      gladys: {
+        event: {
+          emit: sinon.stub(),
+        },
+      },
+    };
+
+    await poll.call(context, {
+      external_id: 'tuya:device',
+      params: [
+        { name: 'IP_ADDRESS', value: '1.1.1.1' },
+        { name: 'LOCAL_KEY', value: 'key' },
+        { name: 'PROTOCOL_VERSION', value: '3.3' },
+        { name: 'LOCAL_OVERRIDE', value: true },
+      ],
+      features: [
+        {
+          external_id: 'tuya:device:switch_1',
+          category: 'switch',
+          type: 'binary',
+        },
+      ],
+    });
+
+    expect(localPoll.calledOnce).to.equal(true);
+    expect(context.connector.request.called).to.equal(false);
+    expect(context.gladys.event.emit.calledOnce).to.equal(true);
+  });
+
+  it('should fallback to cloud for unmapped local feature', async () => {
+    const localPoll = sinon.stub().resolves({ dps: { 1: true } });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+    });
+
+    const request = sinon.stub().resolves({
+      result: [{ code: 'countdown', value: true }],
+    });
+    const emit = sinon.stub();
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: {
+          event: { emit },
+        },
+      },
+      {
+        external_id: 'tuya:device',
+        params: [
+          { name: 'IP_ADDRESS', value: '1.1.1.1' },
+          { name: 'LOCAL_KEY', value: 'key' },
+          { name: 'PROTOCOL_VERSION', value: '3.3' },
+          { name: 'LOCAL_OVERRIDE', value: true },
+        ],
+        features: [
+          {
+            external_id: 'tuya:device:countdown',
+            category: 'switch',
+            type: 'binary',
+          },
+        ],
+      },
+    );
+
+    expect(localPoll.calledOnce).to.equal(true);
+    expect(request.calledOnce).to.equal(true);
+    expect(emit.calledOnce).to.equal(true);
+  });
+
+  it('should use state manager cached value to detect local OFF changes', async () => {
+    const localPoll = sinon
+      .stub()
+      .onFirstCall()
+      .resolves({ dps: { 1: true } })
+      .onSecondCall()
+      .resolves({ dps: { 1: false } });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+    });
+
+    let cachedValue = 0;
+    const emit = sinon.stub().callsFake((eventType, payload) => {
+      if (eventType === EVENTS.DEVICE.NEW_STATE) {
+        cachedValue = payload.state;
+      }
+    });
+
+    const context = {
+      connector: {
+        request: sinon.stub(),
+      },
+      gladys: {
+        event: {
+          emit,
+        },
+        stateManager: {
+          get: sinon.stub().callsFake((entity, selector) => {
+            if (entity === 'deviceFeature' && selector === 'tuya-device-switch-1') {
+              return { last_value: cachedValue };
+            }
+            return null;
+          }),
+        },
+      },
+    };
+
+    const device = {
+      external_id: 'tuya:device',
+      params: [
+        { name: 'IP_ADDRESS', value: '1.1.1.1' },
+        { name: 'LOCAL_KEY', value: 'key' },
+        { name: 'PROTOCOL_VERSION', value: '3.3' },
+        { name: 'LOCAL_OVERRIDE', value: true },
+      ],
+      features: [
+        {
+          external_id: 'tuya:device:switch_1',
+          selector: 'tuya-device-switch-1',
+          category: 'switch',
+          type: 'binary',
+          last_value: 0,
+        },
+      ],
+    };
+
+    await poll.call(context, device);
+    await poll.call(context, device);
+
+    expect(localPoll.calledTwice).to.equal(true);
+    expect(emit.calledTwice).to.equal(true);
+    expect(emit.firstCall.args[1].state).to.equal(1);
+    expect(emit.secondCall.args[1].state).to.equal(0);
+  });
+
+  it('should emit same cloud value only after heartbeat interval', async () => {
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {});
+
+    const request = sinon.stub().resolves({
+      result: [{ code: 'switch_1', value: false }],
+    });
+
+    const clock = sinon.useFakeTimers(new Date('2026-02-27T08:00:00.000Z').getTime());
+    try {
+      const cachedState = {
+        last_value: 0,
+        last_value_changed: new Date(clock.now).toISOString(),
+      };
+      const emit = sinon.stub().callsFake((eventType, payload) => {
+        if (eventType === EVENTS.DEVICE.NEW_STATE) {
+          cachedState.last_value = payload.state;
+          cachedState.last_value_changed = new Date(clock.now).toISOString();
+        }
+      });
+
+      const context = {
+        connector: { request },
+        gladys: {
+          event: { emit },
+          stateManager: {
+            get: sinon.stub().callsFake((entity, selector) => {
+              if (entity === 'deviceFeature' && selector === 'tuya-device-switch-1') {
+                return cachedState;
+              }
+              return null;
+            }),
+          },
+        },
+      };
+
+      const device = {
+        external_id: 'tuya:device',
+        params: [{ name: 'LOCAL_OVERRIDE', value: false }],
+        features: [
+          {
+            external_id: 'tuya:device:switch_1',
+            selector: 'tuya-device-switch-1',
+            category: 'switch',
+            type: 'binary',
+            last_value: 0,
+            last_value_changed: new Date(clock.now).toISOString(),
+          },
+        ],
+      };
+
+      await poll.call(context, device);
+      expect(emit.called).to.equal(false);
+
+      clock.tick(2 * 60 * 1000);
+      await poll.call(context, device);
+      expect(emit.called).to.equal(false);
+
+      clock.tick(60 * 1000 + 1);
+      await poll.call(context, device);
+      expect(emit.calledOnce).to.equal(true);
+      expect(emit.firstCall.args[1].state).to.equal(0);
+    } finally {
+      clock.restore();
+    }
+  });
 });
diff --git a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
index 019affa968..d041414281 100644
--- a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
+++ b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
@@ -27,6 +27,13 @@ describe('Tuya device params utils', () => {
     expect(params).to.deep.equal([{ name: 'test', value: 1 }]);
   });
 
+  it('should get param value', () => {
+    const value = getParamValue([{ name: 'A', value: 42 }], 'A');
+    expect(value).to.equal(42);
+    expect(getParamValue([{ name: 'A', value: 42 }], 'B')).to.equal(undefined);
+    expect(getParamValue(null, 'A')).to.equal(undefined);
+  });
+
   it('should normalize existing device local override', () => {
     const device = {
       params: [

From f82cc73e059dcda62310e548832f68a4daac221e Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 13:21:51 +0100
Subject: [PATCH 39/90] fix: prettier

---
 server/services/tuya/lib/mappings/index.js | 4 +---
 server/services/tuya/lib/tuya.poll.js      | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/server/services/tuya/lib/mappings/index.js b/server/services/tuya/lib/mappings/index.js
index 7f5cdcd49c..f98e394369 100644
--- a/server/services/tuya/lib/mappings/index.js
+++ b/server/services/tuya/lib/mappings/index.js
@@ -21,9 +21,7 @@ const SMART_SOCKET = {
   LOCAL_MAPPINGS: smartSocketLocal,
 };
 
-const LIST_DEVICE_TYPES = [
-  SMART_SOCKET,
-];
+const LIST_DEVICE_TYPES = [SMART_SOCKET];
 
 const normalizeCode = (code) => {
   if (!code) {
diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index 621b861df2..7c60391eb6 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -182,9 +182,9 @@ async function poll(device) {
   const hasLocalConfig = Boolean(ipAddress && localKey && protocolVersion && localOverride === true);
   const requestedMode = localOverride === true ? 'local' : 'cloud';
   logger.debug(
-    `[Tuya][poll] device=${topic} requested=${requestedMode} has_local=${Boolean(hasLocalConfig)} protocol=${
-      protocolVersion || 'none'
-    } ip=${ipAddress || 'none'}`,
+    `[Tuya][poll] device=${topic} requested=${requestedMode} has_local=${Boolean(
+      hasLocalConfig,
+    )} protocol=${protocolVersion || 'none'} ip=${ipAddress || 'none'}`,
   );
 
   let modeUsed = 'cloud';

From 29b7723e0cbde6e06f7af4ef45a414b688dc4eb2 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 15:33:16 +0100
Subject: [PATCH 40/90] test(tuya): cover local scan branch when parsers fail

---
 .../services/tuya/lib/tuya.localScan.test.js  | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index 537967dcbb..cb5f7585dc 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -145,6 +145,55 @@ describe('TuyaHandler.localScan', () => {
     });
   });
 
+  it('should skip message when all parsers fail', async () => {
+    const sockets = [];
+    const dgramStub = {
+      createSocket: () => {
+        const handlers = {};
+        const socket = {
+          on: (event, cb) => {
+            handlers[event] = cb;
+          },
+          bind: () => {},
+          close: () => {},
+          handlers,
+        };
+        sockets.push(socket);
+        return socket;
+      },
+    };
+
+    class MessageParserStub {
+      parse() {
+        throw new Error('invalid packet');
+      }
+    }
+
+    const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
+      dgram: dgramStub,
+      '@demirdeniz/tuyapi-newgen/lib/message-parser': { MessageParser: MessageParserStub },
+      '@demirdeniz/tuyapi-newgen/lib/config': { UDP_KEY: 'key' },
+    });
+
+    const clock = sinon.useFakeTimers();
+    const promise = localScan(1);
+
+    sockets.forEach((socket) => {
+      if (socket.handlers.message) {
+        socket.handlers.message(Buffer.from('bad'));
+      }
+    });
+
+    await clock.tickAsync(1100);
+    const result = await promise;
+    clock.restore();
+
+    expect(result).to.deep.equal({
+      devices: {},
+      portErrors: {},
+    });
+  });
+
   it('should handle socket address errors on bind', async () => {
     const sockets = [];
     const dgramStub = {

From 27152bc5df9483d1500b4a7867c91ac4a2ce29be Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 15:37:45 +0100
Subject: [PATCH 41/90] test(tuya): improve mapping and poll branch coverage

---
 server/services/tuya/lib/mappings/index.js    |   7 -
 server/services/tuya/lib/tuya.poll.js         |   3 -
 .../feature/tuya.convertFeature.test.js       |  25 ++
 .../services/tuya/lib/mappings/index.test.js  |   5 +
 .../test/services/tuya/lib/tuya.poll.test.js  | 242 ++++++++++++++++++
 5 files changed, 272 insertions(+), 10 deletions(-)

diff --git a/server/services/tuya/lib/mappings/index.js b/server/services/tuya/lib/mappings/index.js
index f98e394369..2c326766c0 100644
--- a/server/services/tuya/lib/mappings/index.js
+++ b/server/services/tuya/lib/mappings/index.js
@@ -39,9 +39,6 @@ const normalizeStringSet = (setLike) =>
 
 const DEVICE_TYPE_INDEX = LIST_DEVICE_TYPES.reduce((acc, definition) => {
   const typeName = normalizeCode(definition && definition.DEVICE_TYPE_NAME);
-  if (!typeName) {
-    return acc;
-  }
   acc[typeName] = {
     ...definition,
     CATEGORIES: normalizeStringSet(definition.CATEGORIES),
@@ -56,10 +53,6 @@ const DEVICE_TYPE_INDEX = LIST_DEVICE_TYPES.reduce((acc, definition) => {
 
 const matchDeviceType = (typeDefinition, context) => {
   const { category, productId, modelName, codes } = context;
-  if (!typeDefinition) {
-    return false;
-  }
-
   if (category && typeDefinition.CATEGORIES.has(category)) {
     return true;
   }
diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index 7c60391eb6..6ad5395bac 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -33,9 +33,6 @@ const getFeatureReader = (deviceFeature) => {
 };
 
 const hasDpsKey = (dps, key) => {
-  if (!dps || typeof dps !== 'object') {
-    return false;
-  }
   const stringKey = String(key);
   return Object.prototype.hasOwnProperty.call(dps, stringKey) || Object.prototype.hasOwnProperty.call(dps, key);
 };
diff --git a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
index 86600432ce..10cc0f8609 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
@@ -74,4 +74,29 @@ describe('Tuya convert feature', () => {
 
     expect(result).to.equal(undefined);
   });
+
+  it('should support object values payload', () => {
+    const result = convertFeature(
+      {
+        code: 'switch_1',
+        type: 'Boolean',
+        name: 'name',
+        readOnly: false,
+        values: { min: 2, max: 8 },
+      },
+      'externalId',
+    );
+
+    expect(result).to.deep.eq({
+      category: 'switch',
+      external_id: 'externalId:switch_1',
+      has_feedback: false,
+      max: 8,
+      min: 2,
+      name: 'switch_1',
+      read_only: false,
+      selector: 'externalId:switch_1',
+      type: 'binary',
+    });
+  });
 });
diff --git a/server/test/services/tuya/lib/mappings/index.test.js b/server/test/services/tuya/lib/mappings/index.test.js
index 9d05f059cc..ce8e3bbde3 100644
--- a/server/test/services/tuya/lib/mappings/index.test.js
+++ b/server/test/services/tuya/lib/mappings/index.test.js
@@ -50,6 +50,8 @@ describe('Tuya mappings index', () => {
     expect(cloud.switch_led).to.equal(undefined);
     const unknownCloud = getCloudMapping(DEVICE_TYPES.UNKNOWN);
     expect(unknownCloud.switch_led).to.be.an('object');
+    const unsupportedCloud = getCloudMapping('unsupported-device');
+    expect(unsupportedCloud.switch_led).to.be.an('object');
 
     const local = getLocalMapping(DEVICE_TYPES.SMART_SOCKET);
     expect(local.strict).to.equal(true);
@@ -58,6 +60,9 @@ describe('Tuya mappings index', () => {
     const unknownLocal = getLocalMapping(DEVICE_TYPES.UNKNOWN);
     expect(unknownLocal.strict).to.equal(false);
     expect(unknownLocal.ignoredDps).to.not.include('11');
+    const unsupportedLocal = getLocalMapping('unsupported-device');
+    expect(unsupportedLocal.strict).to.equal(false);
+    expect(unsupportedLocal.ignoredDps).to.not.include('11');
   });
 
   it('should detect device types', () => {
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index 371f79ee07..ee3676fbeb 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -337,3 +337,245 @@ describe('TuyaHandler.poll with local mapping', () => {
     }
   });
 });
+
+describe('TuyaHandler.poll additional branch coverage', () => {
+  it('should warn and return when cloud connector is unavailable', async () => {
+    const logger = { debug: sinon.stub(), warn: sinon.stub() };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      '../../../utils/logger': logger,
+    });
+
+    await poll.call(
+      {
+        connector: null,
+        gladys: { event: { emit: sinon.stub() } },
+      },
+      {
+        external_id: 'tuya:device',
+        params: [{ name: 'LOCAL_OVERRIDE', value: false }],
+        features: [{ external_id: 'tuya:device:switch_1', category: 'switch', type: 'binary' }],
+      },
+    );
+
+    expect(logger.warn.calledOnce).to.equal(true);
+  });
+
+  it('should skip cloud features when code or reader is missing', async () => {
+    const request = sinon.stub().resolves({ result: [{ code: 'switch_1', value: true }] });
+    const emit = sinon.stub();
+    const logger = { debug: sinon.stub(), warn: sinon.stub() };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      '../../../utils/logger': logger,
+    });
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: { event: { emit } },
+      },
+      {
+        external_id: 'tuya:device',
+        params: [{ name: 'LOCAL_OVERRIDE', value: false }],
+        features: [
+          { category: 'switch', type: 'binary' },
+          { external_id: 'invalid', category: 'switch', type: 'binary' },
+          { external_id: 'tuya:device:switch_1' },
+          { external_id: 'tuya:device:switch_1', category: 'unknown', type: 'binary' },
+        ],
+      },
+    );
+
+    expect(request.calledOnce).to.equal(true);
+    expect(emit.called).to.equal(false);
+  });
+
+  it('should warn when local mode is enabled with incomplete config', async () => {
+    const request = sinon.stub().resolves({ result: [{ code: 'switch_1', value: false }] });
+    const emit = sinon.stub();
+    const logger = { debug: sinon.stub(), warn: sinon.stub() };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      '../../../utils/logger': logger,
+    });
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: { event: { emit } },
+      },
+      {
+        external_id: 'tuya:device',
+        params: [
+          { name: 'LOCAL_OVERRIDE', value: true },
+          { name: 'IP_ADDRESS', value: '1.1.1.1' },
+        ],
+        features: [{ external_id: 'tuya:device:switch_1', category: 'switch', type: 'binary' }],
+      },
+    );
+
+    expect(logger.warn.calledOnce).to.equal(true);
+    expect(request.calledOnce).to.equal(true);
+  });
+
+  it('should fallback to cloud when local dps value is undefined', async () => {
+    const localPoll = sinon.stub().resolves({ dps: { 1: undefined } });
+    const request = sinon.stub().resolves({ result: [{ code: 'switch_1', value: true }] });
+    const emit = sinon.stub();
+    const logger = { debug: sinon.stub(), warn: sinon.stub() };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+      '../../../utils/logger': logger,
+    });
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: { event: { emit } },
+      },
+      {
+        external_id: 'tuya:device',
+        params: [
+          { name: 'IP_ADDRESS', value: '1.1.1.1' },
+          { name: 'LOCAL_KEY', value: 'key' },
+          { name: 'PROTOCOL_VERSION', value: '3.3' },
+          { name: 'LOCAL_OVERRIDE', value: true },
+        ],
+        features: [{ external_id: 'tuya:device:switch_1', category: 'switch', type: 'binary' }],
+      },
+    );
+
+    expect(localPoll.calledOnce).to.equal(true);
+    expect(request.calledOnce).to.equal(true);
+  });
+
+  it('should warn when cloud fallback fails after local success', async () => {
+    const localPoll = sinon.stub().resolves({ dps: { 1: true } });
+    const request = sinon.stub().rejects(new Error('cloud down'));
+    const emit = sinon.stub();
+    const logger = { debug: sinon.stub(), warn: sinon.stub() };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+      '../../../utils/logger': logger,
+    });
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: { event: { emit } },
+      },
+      {
+        external_id: 'tuya:device',
+        params: [
+          { name: 'IP_ADDRESS', value: '1.1.1.1' },
+          { name: 'LOCAL_KEY', value: 'key' },
+          { name: 'PROTOCOL_VERSION', value: '3.3' },
+          { name: 'LOCAL_OVERRIDE', value: true },
+        ],
+        features: [
+          { external_id: 'tuya:device:switch_1', category: 'switch', type: 'binary' },
+          { external_id: 'tuya:device:countdown', category: 'switch', type: 'binary' },
+        ],
+      },
+    );
+
+    expect(localPoll.calledOnce).to.equal(true);
+    expect(logger.warn.calledOnce).to.equal(true);
+    expect(emit.calledOnce).to.equal(true);
+  });
+
+  it('should warn and fallback to cloud when local poll throws', async () => {
+    const localPoll = sinon.stub().rejects(new Error('local down'));
+    const request = sinon.stub().resolves({ result: [{ code: 'switch_1', value: true }] });
+    const emit = sinon.stub();
+    const logger = { debug: sinon.stub(), warn: sinon.stub() };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+      '../../../utils/logger': logger,
+    });
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: { event: { emit } },
+      },
+      {
+        external_id: 'tuya:device',
+        params: [
+          { name: 'IP_ADDRESS', value: '1.1.1.1' },
+          { name: 'LOCAL_KEY', value: 'key' },
+          { name: 'PROTOCOL_VERSION', value: '3.3' },
+          { name: 'LOCAL_OVERRIDE', value: true },
+        ],
+        features: [{ external_id: 'tuya:device:switch_1', category: 'switch', type: 'binary' }],
+      },
+    );
+
+    expect(localPoll.calledOnce).to.equal(true);
+    expect(request.calledOnce).to.equal(true);
+    expect(logger.warn.calledOnce).to.equal(true);
+  });
+
+  it('should emit same value when last_value_changed is missing or invalid', async () => {
+    const request = sinon.stub().resolves({ result: [{ code: 'switch_1', value: false }] });
+    const emit = sinon.stub();
+    const logger = { debug: sinon.stub(), warn: sinon.stub() };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      '../../../utils/logger': logger,
+    });
+
+    const context = {
+      connector: { request },
+      gladys: {
+        event: { emit },
+        stateManager: {
+          get: sinon
+            .stub()
+            .onFirstCall()
+            .returns({ last_value: 0 })
+            .onSecondCall()
+            .returns({ last_value: 0, last_value_changed: 'not-a-date' }),
+        },
+      },
+    };
+
+    const device = {
+      external_id: 'tuya:device',
+      params: [{ name: 'LOCAL_OVERRIDE', value: false }],
+      features: [{ external_id: 'tuya:device:switch_1', selector: 'switch-1', category: 'switch', type: 'binary' }],
+    };
+
+    await poll.call(context, device);
+    await poll.call(context, device);
+
+    expect(emit.calledTwice).to.equal(true);
+  });
+
+  it('should skip emit when transformed value is null', async () => {
+    const request = sinon.stub().resolves({ result: [{ code: 'switch_1', value: true }] });
+    const emit = sinon.stub();
+    const logger = { debug: sinon.stub(), warn: sinon.stub() };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      '../../../utils/logger': logger,
+      './device/tuya.deviceMapping': {
+        readValues: {
+          switch: {
+            binary: () => null,
+          },
+        },
+      },
+    });
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: { event: { emit } },
+      },
+      {
+        external_id: 'tuya:device',
+        params: [{ name: 'LOCAL_OVERRIDE', value: false }],
+        features: [{ external_id: 'tuya:device:switch_1', category: 'switch', type: 'binary' }],
+      },
+    );
+
+    expect(emit.called).to.equal(false);
+  });
+});

From d8fab715cfc596f887ddbbf26d00098be87ee2af Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 17:10:50 +0100
Subject: [PATCH 42/90] feat(tuya): restore GitHub issue reporting flow in
 discover

---
 front/src/config/i18n/de.json                 |  13 +-
 front/src/config/i18n/en.json                 |  13 +-
 front/src/config/i18n/fr.json                 |  13 +-
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 784 ++++++++++++++++--
 4 files changed, 739 insertions(+), 84 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 8642e7c117..36301fa8da 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1201,6 +1201,7 @@
       "alreadyCreatedButton": "Bereits erstellt",
       "deleteButton": "Löschen",
       "unmanagedModelButton": "Modell nicht verwaltet oder verfügbar",
+      "partiallyManagedModelButton": "Modell teilweise unterstützt",
       "status": {
         "notConnected": "Gladys konnte keine Verbindung zum Tuya-Cloud-Account herstellen. Bitte gehe zur ",
         "setupPageLink": "Tuya-Einrichtungsseite.",
@@ -1227,7 +1228,17 @@
         "localPollSuccess": "Lokaler Poll OK.",
         "localPollError": "Lokaler Poll fehlgeschlagen:",
         "productIdLabel": "Produkt-ID",
-        "productKeyLabel": "Produktschlüssel"
+        "productKeyLabel": "Produktschlüssel",
+        "createGithubIssue": "Dieses Gerät vorschlagen",
+        "createGithubIssuePartial": "Neue Funktionen vorschlagen",
+        "githubIssueInfo": "Ein Bericht wird mit den Gerätedetails gesendet. Sensible Daten (Lokaler Schlüssel und IP-Adresse) werden maskiert.",
+        "githubIssuePayloadCopied": "Issue-Details wurden in die Zwischenablage kopiert. Bitte in den GitHub-Issue-Text einfügen.",
+        "githubIssuePayloadInfo": "Die Issue-Details sind zu lang für die URL. Bitte den Inhalt unten kopieren und in den GitHub-Issue-Text einfügen.",
+        "githubIssuePayloadCopyButton": "Inhalt kopieren",
+        "githubIssuePayloadOpenEmptyButton": "Leeres Issue erstellen",
+        "githubIssueExistsInfo": "Für dieses Gerät existiert bereits ein Issue. Ein Entwickler kümmert sich demnächst darum. Bei Fragen gerne im Forum <a href=\"https://community.gladysassistant.com/\" target=\"_blank\" rel=\"noopener noreferrer\">community.gladysassistant.com</a>.<br /><br />Die passenden GitHub-Issues findest du hier: <a href=\"{{issuesUrl}}\" target=\"_blank\" rel=\"noopener noreferrer\">Issue-Liste</a>.",
+        "partialFeaturesCount": "({{count}} nicht unterstützt)",
+        "partialFeaturesCountDiscover": "({{count}} noch nicht unterstützt)"
       },
       "discover": {
         "title": "In deinem Tuya-Cloud-Account erkannte Geräte",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index 85418ee0d5..eb08b06584 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1096,6 +1096,7 @@
       "alreadyCreatedButton": "Already created",
       "deleteButton": "Delete",
       "unmanagedModelButton": "Model not managed or available",
+      "partiallyManagedModelButton": "Model partially managed",
       "status": {
         "notConnected": "Gladys failed to connect to Tuya cloud account, please go to ",
         "setupPageLink": "Tuya configuration page.",
@@ -1122,7 +1123,17 @@
         "localPollSuccess": "Local poll OK.",
         "localPollError": "Local poll failed:",
         "productIdLabel": "Product ID",
-        "productKeyLabel": "Product Key"
+        "productKeyLabel": "Product Key",
+        "createGithubIssue": "Suggest this device",
+        "createGithubIssuePartial": "Suggest new functions",
+        "githubIssueInfo": "A report will be sent with the device details. Sensitive data (local key and IP) is masked.",
+        "githubIssuePayloadCopied": "Issue details copied to clipboard. Paste them into the GitHub issue body.",
+        "githubIssuePayloadInfo": "The issue details are too long for the URL. Copy the content below and paste it into the GitHub issue body.",
+        "githubIssuePayloadCopyButton": "Copy content",
+        "githubIssuePayloadOpenEmptyButton": "Create empty issue",
+        "githubIssueExistsInfo": "An issue already exists for this device. A developer will take care of it soon. Feel free to ask on the forum <a href=\"https://community.gladysassistant.com/\" target=\"_blank\" rel=\"noopener noreferrer\">community.gladysassistant.com</a>.<br /><br />You can view related issues on GitHub here: <a href=\"{{issuesUrl}}\" target=\"_blank\" rel=\"noopener noreferrer\">issues list</a>.",
+        "partialFeaturesCount": "({{count}} not implemented)",
+        "partialFeaturesCountDiscover": "({{count}} not yet supported)"
       },
       "discover": {
         "title": "Devices detected on your Tuya cloud account",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index f51152dd14..d5f8b884f5 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1331,6 +1331,7 @@
       "alreadyCreatedButton": "Déjà créé",
       "deleteButton": "Supprimer",
       "unmanagedModelButton": "Modèle non pris en charge ou non disponible",
+      "partiallyManagedModelButton": "Modèle partiellement pris en charge",
       "status": {
         "notConnected": "Gladys n'a pas réussi à se connecter au compte cloud Tuya, plus d'informations sur la ",
         "setupPageLink": "page de configuration Tuya.",
@@ -1357,7 +1358,17 @@
         "localPollSuccess": "Lecture locale OK.",
         "localPollError": "Échec de la lecture locale :",
         "productIdLabel": "Identifiant produit",
-        "productKeyLabel": "Clé produit"
+        "productKeyLabel": "Clé produit",
+        "createGithubIssue": "Proposer ce périphérique",
+        "createGithubIssuePartial": "Proposer nouvelles fonctions",
+        "githubIssueInfo": "Un rapport sera envoyé avec les informations du périphérique. Les données sensibles (clé locale et IP) sont masquées.",
+        "githubIssuePayloadCopied": "Les détails ont été copiés dans le presse-papiers. Collez-les dans le corps de l'issue GitHub.",
+        "githubIssuePayloadInfo": "Les détails sont trop longs pour l'URL. Copiez le contenu ci-dessous et collez-le dans le corps de l'issue GitHub.",
+        "githubIssuePayloadCopyButton": "Copier le contenu",
+        "githubIssuePayloadOpenEmptyButton": "Créer l'issue vide",
+        "githubIssueExistsInfo": "Une issue existe déjà pour ce périphérique. Un développeur s'en occupera prochainement. N'hésitez pas à demander sur le forum <a href=\"https://community.gladysassistant.com/\" target=\"_blank\" rel=\"noopener noreferrer\">community.gladysassistant.com</a>.<br /><br />Vous pouvez consulter les issues correspondantes sur GitHub ici : <a href=\"{{issuesUrl}}\" target=\"_blank\" rel=\"noopener noreferrer\">liste des issues</a>.",
+        "partialFeaturesCount": "({{count}} non implémentée(s))",
+        "partialFeaturesCountDiscover": "({{count}} non implémentable(s))"
       },
       "discover": {
         "title": "Appareils détectés sur votre compte cloud Tuya",
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index da7bf65b02..8e4b6dad6b 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -7,13 +7,159 @@ import DeviceFeatures from '../../../../components/device/view/DeviceFeatures';
 import { connect } from 'unistore/preact';
 import { RequestStatus } from '../../../../utils/consts';
 
-const normalizeBoolean = value =>
+const normalizeBoolean = (value) =>
   value === true || value === 1 || value === '1' || value === 'true' || value === 'TRUE';
 const ONLINE_RECENT_MINUTES = 5;
 const LOCAL_POLL_FREQUENCY = 10 * 1000;
 const CLOUD_POLL_FREQUENCY = 30 * 1000;
+const GITHUB_BASE_URL = 'https://github.com/GladysAssistant/Gladys/issues/new';
+const GITHUB_SEARCH_BASE_URL = 'https://github.com/GladysAssistant/Gladys/issues?q=';
+const GITHUB_SEARCH_API_URL = 'https://api.github.com/search/issues?q=';
+const GITHUB_SEARCH_CACHE_TTL_MS = 1000 * 60 * 5;
+const MAX_GITHUB_CACHE_SIZE = 100;
+const MAX_GITHUB_URL_LENGTH = 8000;
+const githubIssueCache = new Map();
 
-const parseDate = dateValue => {
+const maskIp = (ip) => {
+  if (!ip || typeof ip !== 'string') {
+    return null;
+  }
+  const parts = ip.split('.');
+  if (parts.length !== 4 || parts.some((part) => part === '' || Number.isNaN(parseInt(part, 10)))) {
+    return null;
+  }
+  return `${parts[0]}.x.x.x`;
+};
+
+const sanitizeParams = (params) => {
+  if (!Array.isArray(params)) {
+    return [];
+  }
+  return params.map((param) => {
+    if (param.name === 'LOCAL_KEY') {
+      return { ...param, value: '***' };
+    }
+    if (param.name === 'IP_ADDRESS' || param.name === 'CLOUD_IP') {
+      return { ...param, value: maskIp(param.value) };
+    }
+    return param;
+  });
+};
+
+const getIgnoredLocalDps = (device) => {
+  const mapping = device && device.tuya_mapping ? device.tuya_mapping : null;
+  const ignored = mapping && Array.isArray(mapping.ignored_local_dps) ? mapping.ignored_local_dps : [];
+  return new Set(ignored.map((value) => String(value)));
+};
+
+const getIgnoredCloudCodes = (device) => {
+  const mapping = device && device.tuya_mapping ? device.tuya_mapping : null;
+  const ignored = mapping && Array.isArray(mapping.ignored_cloud_codes) ? mapping.ignored_cloud_codes : [];
+  return new Set(ignored.map((value) => String(value).toLowerCase()));
+};
+
+const LOCAL_CODE_ALIASES = {
+  switch: ['power'],
+  power: ['switch'],
+};
+
+const getLocalDpsFromProperties = (code, properties) => {
+  if (!code || !properties) {
+    return null;
+  }
+  const list = Array.isArray(properties.properties) ? properties.properties : properties;
+  if (!Array.isArray(list)) {
+    return null;
+  }
+  const normalized = code.toLowerCase();
+  const candidates = [normalized, ...(LOCAL_CODE_ALIASES[normalized] || [])];
+  for (const candidate of candidates) {
+    const match = list.find((item) => item && item.code && item.code.toLowerCase() === candidate);
+    if (match && match.dp_id !== undefined && match.dp_id !== null) {
+      return match.dp_id;
+    }
+  }
+  return null;
+};
+
+const getLocalDpsFromCode = (code, device) => {
+  if (!code) {
+    return null;
+  }
+  const propertyMatch = getLocalDpsFromProperties(code, device && device.properties);
+  if (propertyMatch !== null) {
+    return propertyMatch;
+  }
+  const normalized = code.toLowerCase();
+  if (normalized === 'switch' || normalized === 'power') {
+    return 1;
+  }
+  const match = normalized.match(/_(\d+)$/);
+  if (match) {
+    return parseInt(match[1], 10);
+  }
+  return null;
+};
+
+const getKnownDpsKeys = (features, device) => {
+  const keys = new Set();
+  if (!Array.isArray(features)) {
+    return keys;
+  }
+  features.forEach((feature) => {
+    const parts = (feature.external_id || '').split(':');
+    const code = parts.length >= 3 ? parts[2] : null;
+    const dpsKey = getLocalDpsFromCode(code, device);
+    if (dpsKey !== null) {
+      keys.add(String(dpsKey));
+    }
+  });
+  return keys;
+};
+
+const getUnknownDpsKeys = (localPollDps, features, device) => {
+  if (!localPollDps || typeof localPollDps !== 'object') {
+    return [];
+  }
+  const knownKeys = getKnownDpsKeys(features, device);
+  const ignoredDps = getIgnoredLocalDps(device);
+  return Object.keys(localPollDps).filter((key) => !knownKeys.has(key) && !ignoredDps.has(String(key)));
+};
+
+const getUnknownSpecificationCodes = (specifications, features, device) => {
+  if (!specifications || (!Array.isArray(specifications.functions) && !Array.isArray(specifications.status))) {
+    return [];
+  }
+  const knownCodes = new Set();
+  if (Array.isArray(features)) {
+    features.forEach((feature) => {
+      const parts = (feature.external_id || '').split(':');
+      const code = parts.length >= 3 ? parts[2] : null;
+      if (code) {
+        knownCodes.add(code.toLowerCase());
+      }
+    });
+  }
+  const specCodes = new Set();
+  ['functions', 'status'].forEach((key) => {
+    const entries = specifications[key];
+    if (!Array.isArray(entries)) {
+      return;
+    }
+    entries.forEach((entry) => {
+      if (entry && entry.code) {
+        specCodes.add(entry.code);
+      }
+    });
+  });
+  const ignoredCodes = getIgnoredCloudCodes(device);
+  return Array.from(specCodes).filter((code) => {
+    const normalized = code.toLowerCase();
+    return !knownCodes.has(normalized) && !ignoredCodes.has(normalized);
+  });
+};
+
+const parseDate = (dateValue) => {
   if (!dateValue) {
     return null;
   }
@@ -31,7 +177,7 @@ const parseDate = dateValue => {
   return date;
 };
 
-const getMostRecentFeatureDate = device => {
+const getMostRecentFeatureDate = (device) => {
   if (!Array.isArray(device && device.features)) {
     return null;
   }
@@ -47,7 +193,7 @@ const getMostRecentFeatureDate = device => {
   }, null);
 };
 
-const isReachableFromRecentFeatures = device => {
+const isReachableFromRecentFeatures = (device) => {
   const mostRecentFeatureDate = getMostRecentFeatureDate(device);
   if (!mostRecentFeatureDate) {
     return false;
@@ -55,7 +201,7 @@ const isReachableFromRecentFeatures = device => {
   return Date.now() - mostRecentFeatureDate.getTime() <= ONLINE_RECENT_MINUTES * 60 * 1000;
 };
 
-const resolveOnlineStatus = device => {
+const resolveOnlineStatus = (device) => {
   if (isReachableFromRecentFeatures(device)) {
     return true;
   }
@@ -69,13 +215,162 @@ const resolveOnlineStatus = device => {
   return false;
 };
 
-const buildParamsMap = device =>
+const buildParamsMap = (device) =>
   (Array.isArray(device && device.params) ? device.params : []).reduce((acc, param) => {
     acc[param.name] = param.value;
     return acc;
   }, {});
 
-const buildComparableDevice = device => {
+const getParamValue = (device, name) => {
+  const params = Array.isArray(device && device.params) ? device.params : [];
+  const found = params.find((param) => param.name === name);
+  return found ? found.value : undefined;
+};
+
+const getLocalOverrideValue = (device) => {
+  if (!device) {
+    return undefined;
+  }
+  if (device.local_override !== undefined && device.local_override !== null) {
+    return device.local_override;
+  }
+  return getParamValue(device, 'LOCAL_OVERRIDE');
+};
+
+const getLocalPollDpsFromParams = (device) => {
+  const raw = getParamValue(device, 'LOCAL_POLL_DPS');
+  if (!raw) {
+    return null;
+  }
+  if (typeof raw === 'object') {
+    return raw;
+  }
+  try {
+    return JSON.parse(raw);
+  } catch (e) {
+    return null;
+  }
+};
+
+const getProductIdentifier = (device) =>
+  device.product_id ||
+  getParamValue(device, 'PRODUCT_ID') ||
+  device.product_key ||
+  getParamValue(device, 'PRODUCT_KEY') ||
+  'unknown-product';
+
+const buildIssueTitle = (device) => {
+  const isLocal = normalizeBoolean(getLocalOverrideValue(device));
+  const modeLabel = isLocal ? 'local' : 'cloud';
+  const productIdentifier = getProductIdentifier(device);
+  const modelLabel = device.model || device.product_name || device.name || 'Unknown device';
+  return `Tuya (${modeLabel}) [${productIdentifier}]: Add support for ${modelLabel}`;
+};
+
+const buildGithubSearchQuery = (title) => `repo:GladysAssistant/Gladys in:title "${title}"`;
+
+const buildGithubSearchUrl = (title) => `${GITHUB_SEARCH_BASE_URL}${encodeURIComponent(buildGithubSearchQuery(title))}`;
+
+const setGithubIssueCache = (query, value) => {
+  if (githubIssueCache.has(query)) {
+    githubIssueCache.delete(query);
+  }
+  if (githubIssueCache.size >= MAX_GITHUB_CACHE_SIZE) {
+    const oldestKey = githubIssueCache.keys().next().value;
+    if (oldestKey !== undefined) {
+      githubIssueCache.delete(oldestKey);
+    }
+  }
+  githubIssueCache.set(query, value);
+};
+
+const checkGithubIssueExists = async (title) => {
+  const query = buildGithubSearchQuery(title);
+  const cached = githubIssueCache.get(query);
+  if (cached && Date.now() - cached.timestamp < GITHUB_SEARCH_CACHE_TTL_MS) {
+    return cached.exists;
+  }
+
+  let response;
+  if (typeof AbortController === 'undefined') {
+    response = await fetch(`${GITHUB_SEARCH_API_URL}${encodeURIComponent(query)}`);
+  } else {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 5000);
+    try {
+      response = await fetch(`${GITHUB_SEARCH_API_URL}${encodeURIComponent(query)}`, {
+        signal: controller.signal,
+      });
+    } finally {
+      clearTimeout(timeoutId);
+    }
+  }
+  if (!response.ok) {
+    throw new Error('Github search failed');
+  }
+  const data = await response.json();
+  const exists = Boolean(data && typeof data.total_count === 'number' && data.total_count > 0);
+  setGithubIssueCache(query, { exists, timestamp: Date.now() });
+  return exists;
+};
+
+const buildIssuePayload = (device, localPollStatus, localPollError, localPollValidation, localPollDps) => {
+  if (!device) {
+    return null;
+  }
+  const productId = device.product_id || getParamValue(device, 'PRODUCT_ID') || null;
+  const productKey = device.product_key || getParamValue(device, 'PRODUCT_KEY') || null;
+  return {
+    id: device.id || null,
+    name: device.name || null,
+    selector: device.selector || null,
+    model: device.model || device.product_name || null,
+    external_id: device.external_id || null,
+    service_id: device.service_id || null,
+    product_id: productId,
+    product_key: productKey,
+    online: device.online !== undefined ? device.online : null,
+    protocol_version: device.protocol_version || null,
+    local_override: getLocalOverrideValue(device),
+    specifications: device.specifications || null,
+    properties: device.properties || null,
+    thing_model: device.thing_model || null,
+    features: Array.isArray(device.features) ? device.features : [],
+    params: sanitizeParams(device.params),
+    local_poll: {
+      status: localPollStatus || null,
+      error: localPollError || null,
+      protocol: localPollValidation ? localPollValidation.protocol : null,
+      dps: localPollDps || null,
+    },
+  };
+};
+
+const buildIssueBody = (device, localPollStatus, localPollError, localPollValidation, localPollDps) =>
+  `\`\`\`json\n${JSON.stringify(
+    buildIssuePayload(device, localPollStatus, localPollError, localPollValidation, localPollDps),
+    null,
+    2,
+  )}\n\`\`\``;
+
+const createGithubIssueData = (device, localPollStatus, localPollError, localPollValidation, localPollDps) => {
+  const title = encodeURIComponent(buildIssueTitle(device));
+  const body = buildIssueBody(device, localPollStatus, localPollError, localPollValidation, localPollDps);
+  const urlWithBody = `${GITHUB_BASE_URL}?title=${title}&body=${encodeURIComponent(body)}`;
+  if (urlWithBody.length <= MAX_GITHUB_URL_LENGTH) {
+    return { url: urlWithBody, body, truncated: false };
+  }
+  return {
+    url: `${GITHUB_BASE_URL}?title=${title}`,
+    body,
+    truncated: true,
+  };
+};
+
+const createGithubUrl = (device, localPollStatus, localPollError, localPollValidation, localPollDps) =>
+  createGithubIssueData(device, localPollStatus, localPollError, localPollValidation, localPollDps).url;
+
+const buildComparableDevice = (device) => {
   if (!device) {
     return null;
   }
@@ -89,7 +384,7 @@ const buildComparableDevice = device => {
     room_id: device.room_id || null,
     ip: params.IP_ADDRESS || device.ip || '',
     protocol: params.PROTOCOL_VERSION || device.protocol_version || '',
-    local_override: normalizeBoolean(localOverrideRaw)
+    local_override: normalizeBoolean(localOverrideRaw),
   };
 };
 
@@ -108,12 +403,12 @@ const hasDeviceChanged = (device, baselineDevice) => {
   );
 };
 
-const getLocalConfig = device => {
+const getLocalConfig = (device) => {
   if (!device) {
     return {
       ip: '',
       protocol: '',
-      localOverride: false
+      localOverride: false,
     };
   }
   const params = buildParamsMap(device);
@@ -124,7 +419,7 @@ const getLocalConfig = device => {
   return {
     ip: params.IP_ADDRESS || device.ip || '',
     protocol: params.PROTOCOL_VERSION || device.protocol_version || '',
-    localOverride: normalizeBoolean(localOverrideRaw)
+    localOverride: normalizeBoolean(localOverrideRaw),
   };
 };
 
@@ -144,7 +439,14 @@ class TuyaDeviceBox extends Component {
     this.setState({
       device: this.props.device,
       baselineDevice: this.props.device,
-      localPollValidation: null
+      localPollValidation: null,
+      localPollDps: null,
+      githubIssueChecking: false,
+      githubIssueExists: false,
+      githubIssuePayload: null,
+      githubIssuePayloadCopied: false,
+      githubIssuePayloadUrl: null,
+      githubIssueOpened: false,
     });
   }
 
@@ -154,28 +456,39 @@ class TuyaDeviceBox extends Component {
     const isNewDevice = !currentDevice || currentDevice.external_id !== nextDevice.external_id;
     const baselineDevice = this.state.baselineDevice;
     const shouldRefreshBaseline = isNewDevice || !baselineDevice || baselineDevice.updated_at !== nextDevice.updated_at;
+    const mergedNextDevice =
+      currentDevice && currentDevice.specifications && !nextDevice.specifications
+        ? { ...nextDevice, specifications: currentDevice.specifications }
+        : nextDevice;
     if (isNewDevice) {
       this.setState({
-        device: nextDevice,
-        baselineDevice: nextDevice,
-        localPollValidation: null
+        device: mergedNextDevice,
+        baselineDevice: mergedNextDevice,
+        localPollValidation: null,
+        localPollDps: null,
+        githubIssueChecking: false,
+        githubIssueExists: false,
+        githubIssuePayload: null,
+        githubIssuePayloadCopied: false,
+        githubIssuePayloadUrl: null,
+        githubIssueOpened: false,
       });
       return;
     }
     this.setState({
-      device: nextDevice,
-      baselineDevice: shouldRefreshBaseline ? nextDevice : baselineDevice
+      device: mergedNextDevice,
+      baselineDevice: shouldRefreshBaseline ? mergedNextDevice : baselineDevice,
     });
   }
 
   toggleIpMode = () => {
     const device = this.state.device;
     const params = Array.isArray(device.params) ? [...device.params] : [];
-    const overrideParam = params.find(param => param.name === 'LOCAL_OVERRIDE');
+    const overrideParam = params.find((param) => param.name === 'LOCAL_OVERRIDE');
     const localOverrideRaw = overrideParam ? overrideParam.value : device.local_override;
     const currentOverride = normalizeBoolean(localOverrideRaw);
     const nextOverride = currentOverride !== true;
-    const existingIndex = params.findIndex(param => param.name === 'LOCAL_OVERRIDE');
+    const existingIndex = params.findIndex((param) => param.name === 'LOCAL_OVERRIDE');
     if (existingIndex >= 0) {
       params[existingIndex] = { ...params[existingIndex], value: nextOverride };
     } else {
@@ -185,36 +498,42 @@ class TuyaDeviceBox extends Component {
       device: {
         ...device,
         params,
-        local_override: nextOverride
+        local_override: nextOverride,
       },
       localPollValidation: null,
       localPollStatus: null,
-      localPollError: null
+      localPollError: null,
+      localPollDps: null,
+      githubIssueExists: false,
+      githubIssuePayload: null,
+      githubIssuePayloadCopied: false,
+      githubIssuePayloadUrl: null,
+      githubIssueOpened: false,
     });
   };
 
-  updateName = e => {
+  updateName = (e) => {
     this.setState({
       device: {
         ...this.state.device,
-        name: e.target.value
-      }
+        name: e.target.value,
+      },
     });
   };
 
-  updateRoom = e => {
+  updateRoom = (e) => {
     this.setState({
       device: {
         ...this.state.device,
-        room_id: e.target.value
-      }
+        room_id: e.target.value,
+      },
     });
   };
 
-  updateProtocol = e => {
+  updateProtocol = (e) => {
     const protocolVersion = e.target.value;
     const params = Array.isArray(this.state.device.params) ? [...this.state.device.params] : [];
-    const existingIndex = params.findIndex(param => param.name === 'PROTOCOL_VERSION');
+    const existingIndex = params.findIndex((param) => param.name === 'PROTOCOL_VERSION');
     if (existingIndex >= 0) {
       params[existingIndex] = { ...params[existingIndex], value: protocolVersion };
     } else {
@@ -223,11 +542,12 @@ class TuyaDeviceBox extends Component {
     this.setState({
       device: {
         ...this.state.device,
-        params
+        params,
       },
       localPollValidation: null,
       localPollStatus: null,
-      localPollError: null
+      localPollError: null,
+      localPollDps: null,
     });
   };
 
@@ -235,11 +555,12 @@ class TuyaDeviceBox extends Component {
     this.setState({
       localPollStatus: RequestStatus.Getting,
       localPollError: null,
-      localPollProtocol: null
+      localPollProtocol: null,
+      localPollDps: null,
     });
     const params = Array.isArray(this.state.device.params) ? this.state.device.params : [];
-    const getParam = name => {
-      const found = params.find(param => param.name === name);
+    const getParam = (name) => {
+      const found = params.find((param) => param.name === name);
       return found ? found.value : undefined;
     };
     const tryProtocols = ['3.5', '3.4', '3.3', '3.1'];
@@ -249,20 +570,22 @@ class TuyaDeviceBox extends Component {
       let result = null;
       let usedProtocol = selectedProtocol;
       let latestDevice = null;
-      const isValidResult = data => data && typeof data === 'object' && data.dps;
+      const isValidResult = (data) => data && typeof data === 'object' && data.dps;
       for (let i = 0; i < protocolList.length; i += 1) {
         const protocolVersion = protocolList[i];
         try {
           this.setState({
-            localPollProtocol: protocolVersion
+            localPollProtocol: protocolVersion,
           });
           const response = await this.props.httpClient.post('/api/v1/service/tuya/local-poll', {
-            deviceId: this.state.device.external_id && this.state.device.external_id.split(':')[1],
+            deviceId: this.state.device.external_id
+              ? this.state.device.external_id.split(':')[1] || this.state.device.external_id
+              : undefined,
             ip: getParam('IP_ADDRESS') || this.state.device.ip,
             localKey: getParam('LOCAL_KEY') || this.state.device.local_key,
             protocolVersion,
             timeoutMs: 3000,
-            fastScan: true
+            fastScan: true,
           });
           result = response && response.dps ? response : null;
           const updatedDevice = response && response.device ? response.device : null;
@@ -282,7 +605,7 @@ class TuyaDeviceBox extends Component {
       }
       const newParams = [...params];
       if (usedProtocol) {
-        const protocolIndex = newParams.findIndex(param => param.name === 'PROTOCOL_VERSION');
+        const protocolIndex = newParams.findIndex((param) => param.name === 'PROTOCOL_VERSION');
         if (protocolIndex >= 0) {
           newParams[protocolIndex] = { ...newParams[protocolIndex], value: usedProtocol };
         } else {
@@ -293,15 +616,16 @@ class TuyaDeviceBox extends Component {
       this.setState({
         device: {
           ...baseDevice,
-          params: newParams
+          params: newParams,
         },
         localPollStatus: RequestStatus.Success,
         localPollProtocol: null,
         localPollValidation: {
           ip: getParam('IP_ADDRESS') || this.state.device.ip || '',
           protocol: usedProtocol || '',
-          localOverride: true
-        }
+          localOverride: true,
+        },
+        localPollDps: result ? result.dps : null,
       });
     } catch (e) {
       const message =
@@ -309,15 +633,16 @@ class TuyaDeviceBox extends Component {
       this.setState({
         localPollStatus: RequestStatus.Error,
         localPollError: message,
-        localPollProtocol: null
+        localPollProtocol: null,
+        localPollDps: null,
       });
     }
   };
 
-  updateIpAddress = e => {
+  updateIpAddress = (e) => {
     const ipAddress = e.target.value;
     const params = Array.isArray(this.state.device.params) ? [...this.state.device.params] : [];
-    const existingIndex = params.findIndex(param => param.name === 'IP_ADDRESS');
+    const existingIndex = params.findIndex((param) => param.name === 'IP_ADDRESS');
     if (existingIndex >= 0) {
       params[existingIndex] = { ...params[existingIndex], value: ipAddress };
     } else {
@@ -326,28 +651,185 @@ class TuyaDeviceBox extends Component {
     this.setState({
       device: {
         ...this.state.device,
-        params
+        params,
       },
       localPollValidation: null,
       localPollStatus: null,
-      localPollError: null
+      localPollError: null,
+      localPollDps: null,
+    });
+  };
+
+  handleCreateGithubIssue = async (e) => {
+    if (e && e.preventDefault) {
+      e.preventDefault();
+    }
+    const {
+      githubIssueChecking,
+      githubIssueExists,
+      githubIssuePayload,
+      githubIssuePayloadUrl,
+      githubIssueOpened,
+      device,
+      localPollStatus,
+      localPollError,
+      localPollValidation,
+      localPollDps,
+    } = this.state;
+    if (githubIssueChecking || githubIssueExists || githubIssuePayload || githubIssuePayloadUrl || githubIssueOpened) {
+      return;
+    }
+    const persistedLocalPollDps = getLocalPollDpsFromParams(device);
+    const effectiveLocalPollDps = localPollDps || persistedLocalPollDps;
+    const issueData = createGithubIssueData(
+      device,
+      localPollStatus,
+      localPollError,
+      localPollValidation,
+      effectiveLocalPollDps,
+    );
+    const issueUrl = issueData.url;
+    const issueTitle = buildIssueTitle(device);
+    const popup = window.open('about:blank', '_blank');
+    if (popup) {
+      popup.opener = null;
+      popup.document.title = 'GitHub';
+      popup.document.body.innerText = 'Searching for existing issues...';
+    }
+
+    this.setState({ githubIssueChecking: true });
+
+    let shouldOpenIssue = true;
+    try {
+      const exists = await checkGithubIssueExists(issueTitle);
+      if (exists) {
+        shouldOpenIssue = false;
+        this.setState({ githubIssueExists: true });
+      }
+    } catch (error) {
+      shouldOpenIssue = true;
+    } finally {
+      this.setState({ githubIssueChecking: false });
+    }
+
+    const closePopup = () => {
+      if (popup && !popup.closed) {
+        popup.close();
+      }
+    };
+
+    if (!shouldOpenIssue) {
+      closePopup();
+      this.setState({
+        githubIssuePayload: null,
+        githubIssuePayloadCopied: false,
+        githubIssuePayloadUrl: null,
+        githubIssueOpened: false,
+      });
+      return;
+    }
+
+    if (issueData.truncated) {
+      closePopup();
+      this.setState({
+        githubIssuePayload: issueData.body,
+        githubIssuePayloadCopied: false,
+        githubIssuePayloadUrl: issueData.url,
+        githubIssueOpened: false,
+      });
+      return;
+    }
+
+    this.setState({
+      githubIssuePayload: null,
+      githubIssuePayloadCopied: false,
+      githubIssuePayloadUrl: null,
+      githubIssueOpened: true,
     });
+
+    if (popup) {
+      popup.location = issueUrl;
+      return;
+    }
+    window.open(issueUrl, '_blank');
+  };
+
+  copyGithubIssuePayload = async (e) => {
+    if (e && e.preventDefault) {
+      e.preventDefault();
+    }
+    const { githubIssuePayload } = this.state;
+    if (!githubIssuePayload) {
+      return;
+    }
+    let copied = false;
+    if (typeof navigator !== 'undefined' && navigator.clipboard && navigator.clipboard.writeText) {
+      try {
+        await navigator.clipboard.writeText(githubIssuePayload);
+        copied = true;
+      } catch (error) {
+        copied = false;
+      }
+    }
+    if (!copied && this.githubIssueTextarea) {
+      try {
+        this.githubIssueTextarea.focus();
+        this.githubIssueTextarea.select();
+        this.githubIssueTextarea.setSelectionRange(0, this.githubIssueTextarea.value.length);
+        copied = document.execCommand('copy');
+      } catch (error) {
+        copied = false;
+      } finally {
+        this.githubIssueTextarea.blur();
+      }
+    }
+    this.setState({ githubIssuePayloadCopied: copied });
+  };
+
+  openEmptyGithubIssue = async (e) => {
+    if (e && e.preventDefault) {
+      e.preventDefault();
+    }
+    const { githubIssuePayloadUrl, githubIssueChecking, githubIssueExists, githubIssueOpened, device } = this.state;
+    if (!githubIssuePayloadUrl || githubIssueChecking || githubIssueExists || githubIssueOpened || !device) {
+      return;
+    }
+    const issueTitle = buildIssueTitle(device);
+    this.setState({ githubIssueChecking: true });
+    let shouldOpenIssue = true;
+    try {
+      const exists = await checkGithubIssueExists(issueTitle);
+      if (exists) {
+        shouldOpenIssue = false;
+        this.setState({ githubIssueExists: true });
+      }
+    } catch (error) {
+      shouldOpenIssue = true;
+    } finally {
+      this.setState({ githubIssueChecking: false });
+    }
+    if (!shouldOpenIssue) {
+      return;
+    }
+    const title = encodeURIComponent(issueTitle);
+    window.open(`${GITHUB_BASE_URL}?title=${title}`, '_blank');
+    this.setState({ githubIssueOpened: true });
   };
 
   saveDevice = async () => {
     this.setState({
       loading: true,
-      errorMessage: null
+      errorMessage: null,
     });
     try {
       const payload = {
         ...this.state.device,
-        poll_frequency: getLocalConfig(this.state.device).localOverride ? LOCAL_POLL_FREQUENCY : CLOUD_POLL_FREQUENCY
+        poll_frequency: getLocalConfig(this.state.device).localOverride ? LOCAL_POLL_FREQUENCY : CLOUD_POLL_FREQUENCY,
       };
       const savedDevice = await this.props.httpClient.post(`/api/v1/device`, payload);
       this.setState({
         device: savedDevice,
-        baselineDevice: savedDevice
+        baselineDevice: savedDevice,
       });
       if (typeof this.props.onDeviceSaved === 'function') {
         this.props.onDeviceSaved(savedDevice);
@@ -358,11 +840,11 @@ class TuyaDeviceBox extends Component {
         errorMessage = 'integration.tuya.error.conflictError';
       }
       this.setState({
-        errorMessage
+        errorMessage,
       });
     }
     this.setState({
-      loading: false
+      loading: false,
     });
   };
 
@@ -371,7 +853,7 @@ class TuyaDeviceBox extends Component {
       loading: true,
       errorMessage: null,
       tooMuchStatesError: false,
-      statesNumber: undefined
+      statesNumber: undefined,
     });
     try {
       if (this.state.device.created_at) {
@@ -386,12 +868,12 @@ class TuyaDeviceBox extends Component {
         this.setState({ tooMuchStatesError: true, statesNumber });
       } else {
         this.setState({
-          errorMessage: 'integration.tuya.error.defaultDeletionError'
+          errorMessage: 'integration.tuya.error.defaultDeletionError',
         });
       }
     }
     this.setState({
-      loading: false
+      loading: false,
     });
   };
 
@@ -404,7 +886,7 @@ class TuyaDeviceBox extends Component {
       saveButton,
       updateButton,
       alreadyCreatedButton,
-      housesWithRooms
+      housesWithRooms,
     },
     {
       device,
@@ -415,8 +897,15 @@ class TuyaDeviceBox extends Component {
       localPollStatus,
       localPollError,
       localPollProtocol,
-      localPollValidation
-    }
+      localPollValidation,
+      localPollDps,
+      githubIssueChecking,
+      githubIssueExists,
+      githubIssuePayload,
+      githubIssuePayloadCopied,
+      githubIssuePayloadUrl,
+      githubIssueOpened,
+    },
   ) {
     const validModel = device.features && device.features.length > 0;
     const online = resolveOnlineStatus(device);
@@ -454,6 +943,102 @@ class TuyaDeviceBox extends Component {
       validModel && isDiscoverPage && (updateButton || (alreadyCreatedButton && hasLocalChanges));
     const showAlreadyCreatedButton = validModel && alreadyCreatedButton && !hasLocalChanges;
     const pollProtocolLabel = localPollProtocol || protocolVersion || '-';
+    const githubIssuesUrl = githubIssueExists ? buildGithubSearchUrl(buildIssueTitle(device)) : null;
+    const persistedLocalPollDps = getLocalPollDpsFromParams(device);
+    const effectiveLocalPollDps = localOverride ? localPollDps || persistedLocalPollDps : null;
+    const unknownLocalDpsKeys = getUnknownDpsKeys(effectiveLocalPollDps, device.features, device);
+    const unknownSpecCodes = getUnknownSpecificationCodes(device.specifications, device.features, device);
+    const unknownKeys = effectiveLocalPollDps ? unknownLocalDpsKeys : unknownSpecCodes;
+    const hasPartialSupport = validModel && unknownKeys.length > 0;
+    const partialCountLabelId =
+      isDiscoverPage && !device.created_at
+        ? 'integration.tuya.device.partialFeaturesCountDiscover'
+        : 'integration.tuya.device.partialFeaturesCount';
+    const disableGithubIssueButton =
+      githubIssueChecking || githubIssueExists || githubIssueOpened || githubIssuePayloadUrl || githubIssuePayload;
+
+    const renderGithubIssueButton = (labelId, extraClass = '') => (
+      <a
+        class={cx('btn btn-gray', {
+          [extraClass]: !!extraClass,
+          disabled: disableGithubIssueButton,
+        })}
+        href={
+          disableGithubIssueButton
+            ? '#'
+            : createGithubUrl(
+                this.state.device,
+                localPollStatus,
+                localPollError,
+                localPollValidation,
+                effectiveLocalPollDps,
+              )
+        }
+        onClick={this.handleCreateGithubIssue}
+        aria-disabled={disableGithubIssueButton}
+        tabIndex={disableGithubIssueButton ? -1 : undefined}
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <Text id={labelId} />
+      </a>
+    );
+
+    const renderGithubIssueAction = () => (
+      <div>
+        <div class="d-flex flex-wrap">
+          {renderGithubIssueButton('integration.tuya.device.createGithubIssue', 'ml-sm-auto')}
+        </div>
+        {githubIssueExists ? (
+          <div class="alert alert-info mt-2">
+            <MarkupText id="integration.tuya.device.githubIssueExistsInfo" fields={{ issuesUrl: githubIssuesUrl }} />
+          </div>
+        ) : (
+          <div class="text-muted mt-2">
+            <Text id="integration.tuya.device.githubIssueInfo" />
+          </div>
+        )}
+      </div>
+    );
+
+    const renderGithubIssuePayloadInfo = () => {
+      if (!githubIssuePayload && !githubIssuePayloadCopied) {
+        return null;
+      }
+      return (
+        <div class="alert alert-info mt-2">
+          <div>
+            <Text id="integration.tuya.device.githubIssuePayloadInfo" />
+            <textarea
+              class="form-control mt-2"
+              rows="6"
+              readOnly
+              value={githubIssuePayload || ''}
+              ref={(el) => {
+                this.githubIssueTextarea = el;
+              }}
+            />
+            <div class="d-flex align-items-center mt-2">
+              <button onClick={this.copyGithubIssuePayload} class="btn btn-outline-primary">
+                <Text id="integration.tuya.device.githubIssuePayloadCopyButton" />
+              </button>
+              <button
+                onClick={this.openEmptyGithubIssue}
+                class="btn btn-outline-secondary ml-auto"
+                disabled={!githubIssuePayloadUrl || githubIssueChecking || githubIssueExists || githubIssueOpened}
+              >
+                <Text id="integration.tuya.device.githubIssuePayloadOpenEmptyButton" />
+              </button>
+            </div>
+            {githubIssuePayloadCopied && (
+              <div class="text-success mt-2">
+                <Text id="integration.tuya.device.githubIssuePayloadCopied" />
+              </div>
+            )}
+          </div>
+        </div>
+      );
+    };
 
     return (
       <div class="col-md-6">
@@ -468,7 +1053,7 @@ class TuyaDeviceBox extends Component {
           </div>
           <div
             class={cx('dimmer', {
-              active: loading
+              active: loading,
             })}
           >
             <div class="loader" />
@@ -656,9 +1241,9 @@ class TuyaDeviceBox extends Component {
                       <Text id="global.emptySelectOption" />
                     </option>
                     {housesWithRooms &&
-                      housesWithRooms.map(house => (
+                      housesWithRooms.map((house) => (
                         <optgroup label={house.name}>
-                          {house.rooms.map(room => (
+                          {house.rooms.map((room) => (
                             <option selected={room.id === device.room_id} value={room.id}>
                               {room.name}
                             </option>
@@ -672,46 +1257,66 @@ class TuyaDeviceBox extends Component {
                   <div class="form-group">
                     <label class="form-label">
                       <Text id="integration.tuya.device.featuresLabel" />
+                      {hasPartialSupport && (
+                        <span class="text-muted ml-2">
+                          <Text id={partialCountLabelId} fields={{ count: unknownKeys.length }} />
+                        </span>
+                      )}
                     </label>
                     <DeviceFeatures features={device.features} />
                   </div>
                 )}
 
+                {hasPartialSupport && (
+                  <div class="alert alert-warning mt-3 mb-3">
+                    <Text id="integration.tuya.partiallyManagedModelButton" />
+                  </div>
+                )}
+
                 <div class="form-group">
                   {requiresLocalPollValidation && !localPollValidated && (
                     <div class="text-muted mb-2">
                       <Text id="integration.tuya.device.localPollRequired" />
                     </div>
                   )}
-                  {showAlreadyCreatedButton && (
-                    <button class="btn btn-primary mr-2" disabled="true">
-                      <Text id="integration.tuya.alreadyCreatedButton" />
-                    </button>
-                  )}
+                  <div class="d-flex flex-wrap align-items-center justify-content-between">
+                    <div class="d-flex flex-wrap align-items-center">
+                      {showAlreadyCreatedButton && (
+                        <button class="btn btn-primary mr-2" disabled="true">
+                          <Text id="integration.tuya.alreadyCreatedButton" />
+                        </button>
+                      )}
 
-                  {showUpdateButton && (
-                    <button onClick={this.saveDevice} class="btn btn-success mr-2" disabled={!canSave}>
-                      <Text id="integration.tuya.updateButton" />
-                    </button>
-                  )}
+                      {showUpdateButton && (
+                        <button onClick={this.saveDevice} class="btn btn-success mr-2" disabled={!canSave}>
+                          <Text id="integration.tuya.updateButton" />
+                        </button>
+                      )}
 
-                  {validModel && saveButton && (
-                    <button onClick={this.saveDevice} class="btn btn-success mr-2" disabled={!canSave}>
-                      <Text id="integration.tuya.saveButton" />
-                    </button>
-                  )}
+                      {validModel && saveButton && (
+                        <button onClick={this.saveDevice} class="btn btn-success mr-2" disabled={!canSave}>
+                          <Text id="integration.tuya.saveButton" />
+                        </button>
+                      )}
 
-                  {validModel && deleteButton && (
-                    <button onClick={this.deleteDevice} class="btn btn-danger">
-                      <Text id="integration.tuya.deleteButton" />
-                    </button>
-                  )}
+                      {validModel && deleteButton && (
+                        <button onClick={this.deleteDevice} class="btn btn-danger">
+                          <Text id="integration.tuya.deleteButton" />
+                        </button>
+                      )}
+                    </div>
+
+                    {hasPartialSupport && isDiscoverPage && (
+                      <div>{renderGithubIssueButton('integration.tuya.device.createGithubIssuePartial')}</div>
+                    )}
+                  </div>
 
                   {!validModel && (
                     <div>
                       <div class="alert alert-warning">
                         <Text id="integration.tuya.unmanagedModelButton" />
                       </div>
+                      {isDiscoverPage && renderGithubIssueAction()}
                     </div>
                   )}
 
@@ -723,6 +1328,23 @@ class TuyaDeviceBox extends Component {
                     </Link>
                   )}
                 </div>
+                {hasPartialSupport && isDiscoverPage && (
+                  <>
+                    {githubIssueExists ? (
+                      <div class="alert alert-info mt-2">
+                        <MarkupText
+                          id="integration.tuya.device.githubIssueExistsInfo"
+                          fields={{ issuesUrl: githubIssuesUrl }}
+                        />
+                      </div>
+                    ) : (
+                      <div class="text-muted mt-2">
+                        <Text id="integration.tuya.device.githubIssueInfo" />
+                      </div>
+                    )}
+                  </>
+                )}
+                {renderGithubIssuePayloadInfo()}
               </div>
             </div>
           </div>

From e66e53c5265bca1618dfb336e68e36eb12059dfd Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 18:01:29 +0100
Subject: [PATCH 43/90] style(tuya): format TuyaDeviceBox with project prettier

---
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 194 +++++++++---------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 8e4b6dad6b..92fa856ef3 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -7,7 +7,7 @@ import DeviceFeatures from '../../../../components/device/view/DeviceFeatures';
 import { connect } from 'unistore/preact';
 import { RequestStatus } from '../../../../utils/consts';
 
-const normalizeBoolean = (value) =>
+const normalizeBoolean = value =>
   value === true || value === 1 || value === '1' || value === 'true' || value === 'TRUE';
 const ONLINE_RECENT_MINUTES = 5;
 const LOCAL_POLL_FREQUENCY = 10 * 1000;
@@ -20,22 +20,22 @@ const MAX_GITHUB_CACHE_SIZE = 100;
 const MAX_GITHUB_URL_LENGTH = 8000;
 const githubIssueCache = new Map();
 
-const maskIp = (ip) => {
+const maskIp = ip => {
   if (!ip || typeof ip !== 'string') {
     return null;
   }
   const parts = ip.split('.');
-  if (parts.length !== 4 || parts.some((part) => part === '' || Number.isNaN(parseInt(part, 10)))) {
+  if (parts.length !== 4 || parts.some(part => part === '' || Number.isNaN(parseInt(part, 10)))) {
     return null;
   }
   return `${parts[0]}.x.x.x`;
 };
 
-const sanitizeParams = (params) => {
+const sanitizeParams = params => {
   if (!Array.isArray(params)) {
     return [];
   }
-  return params.map((param) => {
+  return params.map(param => {
     if (param.name === 'LOCAL_KEY') {
       return { ...param, value: '***' };
     }
@@ -46,21 +46,21 @@ const sanitizeParams = (params) => {
   });
 };
 
-const getIgnoredLocalDps = (device) => {
+const getIgnoredLocalDps = device => {
   const mapping = device && device.tuya_mapping ? device.tuya_mapping : null;
   const ignored = mapping && Array.isArray(mapping.ignored_local_dps) ? mapping.ignored_local_dps : [];
-  return new Set(ignored.map((value) => String(value)));
+  return new Set(ignored.map(value => String(value)));
 };
 
-const getIgnoredCloudCodes = (device) => {
+const getIgnoredCloudCodes = device => {
   const mapping = device && device.tuya_mapping ? device.tuya_mapping : null;
   const ignored = mapping && Array.isArray(mapping.ignored_cloud_codes) ? mapping.ignored_cloud_codes : [];
-  return new Set(ignored.map((value) => String(value).toLowerCase()));
+  return new Set(ignored.map(value => String(value).toLowerCase()));
 };
 
 const LOCAL_CODE_ALIASES = {
   switch: ['power'],
-  power: ['switch'],
+  power: ['switch']
 };
 
 const getLocalDpsFromProperties = (code, properties) => {
@@ -74,7 +74,7 @@ const getLocalDpsFromProperties = (code, properties) => {
   const normalized = code.toLowerCase();
   const candidates = [normalized, ...(LOCAL_CODE_ALIASES[normalized] || [])];
   for (const candidate of candidates) {
-    const match = list.find((item) => item && item.code && item.code.toLowerCase() === candidate);
+    const match = list.find(item => item && item.code && item.code.toLowerCase() === candidate);
     if (match && match.dp_id !== undefined && match.dp_id !== null) {
       return match.dp_id;
     }
@@ -106,7 +106,7 @@ const getKnownDpsKeys = (features, device) => {
   if (!Array.isArray(features)) {
     return keys;
   }
-  features.forEach((feature) => {
+  features.forEach(feature => {
     const parts = (feature.external_id || '').split(':');
     const code = parts.length >= 3 ? parts[2] : null;
     const dpsKey = getLocalDpsFromCode(code, device);
@@ -123,7 +123,7 @@ const getUnknownDpsKeys = (localPollDps, features, device) => {
   }
   const knownKeys = getKnownDpsKeys(features, device);
   const ignoredDps = getIgnoredLocalDps(device);
-  return Object.keys(localPollDps).filter((key) => !knownKeys.has(key) && !ignoredDps.has(String(key)));
+  return Object.keys(localPollDps).filter(key => !knownKeys.has(key) && !ignoredDps.has(String(key)));
 };
 
 const getUnknownSpecificationCodes = (specifications, features, device) => {
@@ -132,7 +132,7 @@ const getUnknownSpecificationCodes = (specifications, features, device) => {
   }
   const knownCodes = new Set();
   if (Array.isArray(features)) {
-    features.forEach((feature) => {
+    features.forEach(feature => {
       const parts = (feature.external_id || '').split(':');
       const code = parts.length >= 3 ? parts[2] : null;
       if (code) {
@@ -141,25 +141,25 @@ const getUnknownSpecificationCodes = (specifications, features, device) => {
     });
   }
   const specCodes = new Set();
-  ['functions', 'status'].forEach((key) => {
+  ['functions', 'status'].forEach(key => {
     const entries = specifications[key];
     if (!Array.isArray(entries)) {
       return;
     }
-    entries.forEach((entry) => {
+    entries.forEach(entry => {
       if (entry && entry.code) {
         specCodes.add(entry.code);
       }
     });
   });
   const ignoredCodes = getIgnoredCloudCodes(device);
-  return Array.from(specCodes).filter((code) => {
+  return Array.from(specCodes).filter(code => {
     const normalized = code.toLowerCase();
     return !knownCodes.has(normalized) && !ignoredCodes.has(normalized);
   });
 };
 
-const parseDate = (dateValue) => {
+const parseDate = dateValue => {
   if (!dateValue) {
     return null;
   }
@@ -177,7 +177,7 @@ const parseDate = (dateValue) => {
   return date;
 };
 
-const getMostRecentFeatureDate = (device) => {
+const getMostRecentFeatureDate = device => {
   if (!Array.isArray(device && device.features)) {
     return null;
   }
@@ -193,7 +193,7 @@ const getMostRecentFeatureDate = (device) => {
   }, null);
 };
 
-const isReachableFromRecentFeatures = (device) => {
+const isReachableFromRecentFeatures = device => {
   const mostRecentFeatureDate = getMostRecentFeatureDate(device);
   if (!mostRecentFeatureDate) {
     return false;
@@ -201,7 +201,7 @@ const isReachableFromRecentFeatures = (device) => {
   return Date.now() - mostRecentFeatureDate.getTime() <= ONLINE_RECENT_MINUTES * 60 * 1000;
 };
 
-const resolveOnlineStatus = (device) => {
+const resolveOnlineStatus = device => {
   if (isReachableFromRecentFeatures(device)) {
     return true;
   }
@@ -215,7 +215,7 @@ const resolveOnlineStatus = (device) => {
   return false;
 };
 
-const buildParamsMap = (device) =>
+const buildParamsMap = device =>
   (Array.isArray(device && device.params) ? device.params : []).reduce((acc, param) => {
     acc[param.name] = param.value;
     return acc;
@@ -223,11 +223,11 @@ const buildParamsMap = (device) =>
 
 const getParamValue = (device, name) => {
   const params = Array.isArray(device && device.params) ? device.params : [];
-  const found = params.find((param) => param.name === name);
+  const found = params.find(param => param.name === name);
   return found ? found.value : undefined;
 };
 
-const getLocalOverrideValue = (device) => {
+const getLocalOverrideValue = device => {
   if (!device) {
     return undefined;
   }
@@ -237,7 +237,7 @@ const getLocalOverrideValue = (device) => {
   return getParamValue(device, 'LOCAL_OVERRIDE');
 };
 
-const getLocalPollDpsFromParams = (device) => {
+const getLocalPollDpsFromParams = device => {
   const raw = getParamValue(device, 'LOCAL_POLL_DPS');
   if (!raw) {
     return null;
@@ -252,14 +252,14 @@ const getLocalPollDpsFromParams = (device) => {
   }
 };
 
-const getProductIdentifier = (device) =>
+const getProductIdentifier = device =>
   device.product_id ||
   getParamValue(device, 'PRODUCT_ID') ||
   device.product_key ||
   getParamValue(device, 'PRODUCT_KEY') ||
   'unknown-product';
 
-const buildIssueTitle = (device) => {
+const buildIssueTitle = device => {
   const isLocal = normalizeBoolean(getLocalOverrideValue(device));
   const modeLabel = isLocal ? 'local' : 'cloud';
   const productIdentifier = getProductIdentifier(device);
@@ -267,9 +267,9 @@ const buildIssueTitle = (device) => {
   return `Tuya (${modeLabel}) [${productIdentifier}]: Add support for ${modelLabel}`;
 };
 
-const buildGithubSearchQuery = (title) => `repo:GladysAssistant/Gladys in:title "${title}"`;
+const buildGithubSearchQuery = title => `repo:GladysAssistant/Gladys in:title "${title}"`;
 
-const buildGithubSearchUrl = (title) => `${GITHUB_SEARCH_BASE_URL}${encodeURIComponent(buildGithubSearchQuery(title))}`;
+const buildGithubSearchUrl = title => `${GITHUB_SEARCH_BASE_URL}${encodeURIComponent(buildGithubSearchQuery(title))}`;
 
 const setGithubIssueCache = (query, value) => {
   if (githubIssueCache.has(query)) {
@@ -284,7 +284,7 @@ const setGithubIssueCache = (query, value) => {
   githubIssueCache.set(query, value);
 };
 
-const checkGithubIssueExists = async (title) => {
+const checkGithubIssueExists = async title => {
   const query = buildGithubSearchQuery(title);
   const cached = githubIssueCache.get(query);
   if (cached && Date.now() - cached.timestamp < GITHUB_SEARCH_CACHE_TTL_MS) {
@@ -299,7 +299,7 @@ const checkGithubIssueExists = async (title) => {
     const timeoutId = setTimeout(() => controller.abort(), 5000);
     try {
       response = await fetch(`${GITHUB_SEARCH_API_URL}${encodeURIComponent(query)}`, {
-        signal: controller.signal,
+        signal: controller.signal
       });
     } finally {
       clearTimeout(timeoutId);
@@ -341,8 +341,8 @@ const buildIssuePayload = (device, localPollStatus, localPollError, localPollVal
       status: localPollStatus || null,
       error: localPollError || null,
       protocol: localPollValidation ? localPollValidation.protocol : null,
-      dps: localPollDps || null,
-    },
+      dps: localPollDps || null
+    }
   };
 };
 
@@ -350,7 +350,7 @@ const buildIssueBody = (device, localPollStatus, localPollError, localPollValida
   `\`\`\`json\n${JSON.stringify(
     buildIssuePayload(device, localPollStatus, localPollError, localPollValidation, localPollDps),
     null,
-    2,
+    2
   )}\n\`\`\``;
 
 const createGithubIssueData = (device, localPollStatus, localPollError, localPollValidation, localPollDps) => {
@@ -363,14 +363,14 @@ const createGithubIssueData = (device, localPollStatus, localPollError, localPol
   return {
     url: `${GITHUB_BASE_URL}?title=${title}`,
     body,
-    truncated: true,
+    truncated: true
   };
 };
 
 const createGithubUrl = (device, localPollStatus, localPollError, localPollValidation, localPollDps) =>
   createGithubIssueData(device, localPollStatus, localPollError, localPollValidation, localPollDps).url;
 
-const buildComparableDevice = (device) => {
+const buildComparableDevice = device => {
   if (!device) {
     return null;
   }
@@ -384,7 +384,7 @@ const buildComparableDevice = (device) => {
     room_id: device.room_id || null,
     ip: params.IP_ADDRESS || device.ip || '',
     protocol: params.PROTOCOL_VERSION || device.protocol_version || '',
-    local_override: normalizeBoolean(localOverrideRaw),
+    local_override: normalizeBoolean(localOverrideRaw)
   };
 };
 
@@ -403,12 +403,12 @@ const hasDeviceChanged = (device, baselineDevice) => {
   );
 };
 
-const getLocalConfig = (device) => {
+const getLocalConfig = device => {
   if (!device) {
     return {
       ip: '',
       protocol: '',
-      localOverride: false,
+      localOverride: false
     };
   }
   const params = buildParamsMap(device);
@@ -419,7 +419,7 @@ const getLocalConfig = (device) => {
   return {
     ip: params.IP_ADDRESS || device.ip || '',
     protocol: params.PROTOCOL_VERSION || device.protocol_version || '',
-    localOverride: normalizeBoolean(localOverrideRaw),
+    localOverride: normalizeBoolean(localOverrideRaw)
   };
 };
 
@@ -446,7 +446,7 @@ class TuyaDeviceBox extends Component {
       githubIssuePayload: null,
       githubIssuePayloadCopied: false,
       githubIssuePayloadUrl: null,
-      githubIssueOpened: false,
+      githubIssueOpened: false
     });
   }
 
@@ -471,24 +471,24 @@ class TuyaDeviceBox extends Component {
         githubIssuePayload: null,
         githubIssuePayloadCopied: false,
         githubIssuePayloadUrl: null,
-        githubIssueOpened: false,
+        githubIssueOpened: false
       });
       return;
     }
     this.setState({
       device: mergedNextDevice,
-      baselineDevice: shouldRefreshBaseline ? mergedNextDevice : baselineDevice,
+      baselineDevice: shouldRefreshBaseline ? mergedNextDevice : baselineDevice
     });
   }
 
   toggleIpMode = () => {
     const device = this.state.device;
     const params = Array.isArray(device.params) ? [...device.params] : [];
-    const overrideParam = params.find((param) => param.name === 'LOCAL_OVERRIDE');
+    const overrideParam = params.find(param => param.name === 'LOCAL_OVERRIDE');
     const localOverrideRaw = overrideParam ? overrideParam.value : device.local_override;
     const currentOverride = normalizeBoolean(localOverrideRaw);
     const nextOverride = currentOverride !== true;
-    const existingIndex = params.findIndex((param) => param.name === 'LOCAL_OVERRIDE');
+    const existingIndex = params.findIndex(param => param.name === 'LOCAL_OVERRIDE');
     if (existingIndex >= 0) {
       params[existingIndex] = { ...params[existingIndex], value: nextOverride };
     } else {
@@ -498,7 +498,7 @@ class TuyaDeviceBox extends Component {
       device: {
         ...device,
         params,
-        local_override: nextOverride,
+        local_override: nextOverride
       },
       localPollValidation: null,
       localPollStatus: null,
@@ -508,32 +508,32 @@ class TuyaDeviceBox extends Component {
       githubIssuePayload: null,
       githubIssuePayloadCopied: false,
       githubIssuePayloadUrl: null,
-      githubIssueOpened: false,
+      githubIssueOpened: false
     });
   };
 
-  updateName = (e) => {
+  updateName = e => {
     this.setState({
       device: {
         ...this.state.device,
-        name: e.target.value,
-      },
+        name: e.target.value
+      }
     });
   };
 
-  updateRoom = (e) => {
+  updateRoom = e => {
     this.setState({
       device: {
         ...this.state.device,
-        room_id: e.target.value,
-      },
+        room_id: e.target.value
+      }
     });
   };
 
-  updateProtocol = (e) => {
+  updateProtocol = e => {
     const protocolVersion = e.target.value;
     const params = Array.isArray(this.state.device.params) ? [...this.state.device.params] : [];
-    const existingIndex = params.findIndex((param) => param.name === 'PROTOCOL_VERSION');
+    const existingIndex = params.findIndex(param => param.name === 'PROTOCOL_VERSION');
     if (existingIndex >= 0) {
       params[existingIndex] = { ...params[existingIndex], value: protocolVersion };
     } else {
@@ -542,12 +542,12 @@ class TuyaDeviceBox extends Component {
     this.setState({
       device: {
         ...this.state.device,
-        params,
+        params
       },
       localPollValidation: null,
       localPollStatus: null,
       localPollError: null,
-      localPollDps: null,
+      localPollDps: null
     });
   };
 
@@ -556,11 +556,11 @@ class TuyaDeviceBox extends Component {
       localPollStatus: RequestStatus.Getting,
       localPollError: null,
       localPollProtocol: null,
-      localPollDps: null,
+      localPollDps: null
     });
     const params = Array.isArray(this.state.device.params) ? this.state.device.params : [];
-    const getParam = (name) => {
-      const found = params.find((param) => param.name === name);
+    const getParam = name => {
+      const found = params.find(param => param.name === name);
       return found ? found.value : undefined;
     };
     const tryProtocols = ['3.5', '3.4', '3.3', '3.1'];
@@ -570,12 +570,12 @@ class TuyaDeviceBox extends Component {
       let result = null;
       let usedProtocol = selectedProtocol;
       let latestDevice = null;
-      const isValidResult = (data) => data && typeof data === 'object' && data.dps;
+      const isValidResult = data => data && typeof data === 'object' && data.dps;
       for (let i = 0; i < protocolList.length; i += 1) {
         const protocolVersion = protocolList[i];
         try {
           this.setState({
-            localPollProtocol: protocolVersion,
+            localPollProtocol: protocolVersion
           });
           const response = await this.props.httpClient.post('/api/v1/service/tuya/local-poll', {
             deviceId: this.state.device.external_id
@@ -585,7 +585,7 @@ class TuyaDeviceBox extends Component {
             localKey: getParam('LOCAL_KEY') || this.state.device.local_key,
             protocolVersion,
             timeoutMs: 3000,
-            fastScan: true,
+            fastScan: true
           });
           result = response && response.dps ? response : null;
           const updatedDevice = response && response.device ? response.device : null;
@@ -605,7 +605,7 @@ class TuyaDeviceBox extends Component {
       }
       const newParams = [...params];
       if (usedProtocol) {
-        const protocolIndex = newParams.findIndex((param) => param.name === 'PROTOCOL_VERSION');
+        const protocolIndex = newParams.findIndex(param => param.name === 'PROTOCOL_VERSION');
         if (protocolIndex >= 0) {
           newParams[protocolIndex] = { ...newParams[protocolIndex], value: usedProtocol };
         } else {
@@ -616,16 +616,16 @@ class TuyaDeviceBox extends Component {
       this.setState({
         device: {
           ...baseDevice,
-          params: newParams,
+          params: newParams
         },
         localPollStatus: RequestStatus.Success,
         localPollProtocol: null,
         localPollValidation: {
           ip: getParam('IP_ADDRESS') || this.state.device.ip || '',
           protocol: usedProtocol || '',
-          localOverride: true,
+          localOverride: true
         },
-        localPollDps: result ? result.dps : null,
+        localPollDps: result ? result.dps : null
       });
     } catch (e) {
       const message =
@@ -634,15 +634,15 @@ class TuyaDeviceBox extends Component {
         localPollStatus: RequestStatus.Error,
         localPollError: message,
         localPollProtocol: null,
-        localPollDps: null,
+        localPollDps: null
       });
     }
   };
 
-  updateIpAddress = (e) => {
+  updateIpAddress = e => {
     const ipAddress = e.target.value;
     const params = Array.isArray(this.state.device.params) ? [...this.state.device.params] : [];
-    const existingIndex = params.findIndex((param) => param.name === 'IP_ADDRESS');
+    const existingIndex = params.findIndex(param => param.name === 'IP_ADDRESS');
     if (existingIndex >= 0) {
       params[existingIndex] = { ...params[existingIndex], value: ipAddress };
     } else {
@@ -651,16 +651,16 @@ class TuyaDeviceBox extends Component {
     this.setState({
       device: {
         ...this.state.device,
-        params,
+        params
       },
       localPollValidation: null,
       localPollStatus: null,
       localPollError: null,
-      localPollDps: null,
+      localPollDps: null
     });
   };
 
-  handleCreateGithubIssue = async (e) => {
+  handleCreateGithubIssue = async e => {
     if (e && e.preventDefault) {
       e.preventDefault();
     }
@@ -674,7 +674,7 @@ class TuyaDeviceBox extends Component {
       localPollStatus,
       localPollError,
       localPollValidation,
-      localPollDps,
+      localPollDps
     } = this.state;
     if (githubIssueChecking || githubIssueExists || githubIssuePayload || githubIssuePayloadUrl || githubIssueOpened) {
       return;
@@ -686,7 +686,7 @@ class TuyaDeviceBox extends Component {
       localPollStatus,
       localPollError,
       localPollValidation,
-      effectiveLocalPollDps,
+      effectiveLocalPollDps
     );
     const issueUrl = issueData.url;
     const issueTitle = buildIssueTitle(device);
@@ -724,7 +724,7 @@ class TuyaDeviceBox extends Component {
         githubIssuePayload: null,
         githubIssuePayloadCopied: false,
         githubIssuePayloadUrl: null,
-        githubIssueOpened: false,
+        githubIssueOpened: false
       });
       return;
     }
@@ -735,7 +735,7 @@ class TuyaDeviceBox extends Component {
         githubIssuePayload: issueData.body,
         githubIssuePayloadCopied: false,
         githubIssuePayloadUrl: issueData.url,
-        githubIssueOpened: false,
+        githubIssueOpened: false
       });
       return;
     }
@@ -744,7 +744,7 @@ class TuyaDeviceBox extends Component {
       githubIssuePayload: null,
       githubIssuePayloadCopied: false,
       githubIssuePayloadUrl: null,
-      githubIssueOpened: true,
+      githubIssueOpened: true
     });
 
     if (popup) {
@@ -754,7 +754,7 @@ class TuyaDeviceBox extends Component {
     window.open(issueUrl, '_blank');
   };
 
-  copyGithubIssuePayload = async (e) => {
+  copyGithubIssuePayload = async e => {
     if (e && e.preventDefault) {
       e.preventDefault();
     }
@@ -786,7 +786,7 @@ class TuyaDeviceBox extends Component {
     this.setState({ githubIssuePayloadCopied: copied });
   };
 
-  openEmptyGithubIssue = async (e) => {
+  openEmptyGithubIssue = async e => {
     if (e && e.preventDefault) {
       e.preventDefault();
     }
@@ -819,17 +819,17 @@ class TuyaDeviceBox extends Component {
   saveDevice = async () => {
     this.setState({
       loading: true,
-      errorMessage: null,
+      errorMessage: null
     });
     try {
       const payload = {
         ...this.state.device,
-        poll_frequency: getLocalConfig(this.state.device).localOverride ? LOCAL_POLL_FREQUENCY : CLOUD_POLL_FREQUENCY,
+        poll_frequency: getLocalConfig(this.state.device).localOverride ? LOCAL_POLL_FREQUENCY : CLOUD_POLL_FREQUENCY
       };
       const savedDevice = await this.props.httpClient.post(`/api/v1/device`, payload);
       this.setState({
         device: savedDevice,
-        baselineDevice: savedDevice,
+        baselineDevice: savedDevice
       });
       if (typeof this.props.onDeviceSaved === 'function') {
         this.props.onDeviceSaved(savedDevice);
@@ -840,11 +840,11 @@ class TuyaDeviceBox extends Component {
         errorMessage = 'integration.tuya.error.conflictError';
       }
       this.setState({
-        errorMessage,
+        errorMessage
       });
     }
     this.setState({
-      loading: false,
+      loading: false
     });
   };
 
@@ -853,7 +853,7 @@ class TuyaDeviceBox extends Component {
       loading: true,
       errorMessage: null,
       tooMuchStatesError: false,
-      statesNumber: undefined,
+      statesNumber: undefined
     });
     try {
       if (this.state.device.created_at) {
@@ -868,12 +868,12 @@ class TuyaDeviceBox extends Component {
         this.setState({ tooMuchStatesError: true, statesNumber });
       } else {
         this.setState({
-          errorMessage: 'integration.tuya.error.defaultDeletionError',
+          errorMessage: 'integration.tuya.error.defaultDeletionError'
         });
       }
     }
     this.setState({
-      loading: false,
+      loading: false
     });
   };
 
@@ -886,7 +886,7 @@ class TuyaDeviceBox extends Component {
       saveButton,
       updateButton,
       alreadyCreatedButton,
-      housesWithRooms,
+      housesWithRooms
     },
     {
       device,
@@ -904,8 +904,8 @@ class TuyaDeviceBox extends Component {
       githubIssuePayload,
       githubIssuePayloadCopied,
       githubIssuePayloadUrl,
-      githubIssueOpened,
-    },
+      githubIssueOpened
+    }
   ) {
     const validModel = device.features && device.features.length > 0;
     const online = resolveOnlineStatus(device);
@@ -961,7 +961,7 @@ class TuyaDeviceBox extends Component {
       <a
         class={cx('btn btn-gray', {
           [extraClass]: !!extraClass,
-          disabled: disableGithubIssueButton,
+          disabled: disableGithubIssueButton
         })}
         href={
           disableGithubIssueButton
@@ -971,7 +971,7 @@ class TuyaDeviceBox extends Component {
                 localPollStatus,
                 localPollError,
                 localPollValidation,
-                effectiveLocalPollDps,
+                effectiveLocalPollDps
               )
         }
         onClick={this.handleCreateGithubIssue}
@@ -1014,7 +1014,7 @@ class TuyaDeviceBox extends Component {
               rows="6"
               readOnly
               value={githubIssuePayload || ''}
-              ref={(el) => {
+              ref={el => {
                 this.githubIssueTextarea = el;
               }}
             />
@@ -1053,7 +1053,7 @@ class TuyaDeviceBox extends Component {
           </div>
           <div
             class={cx('dimmer', {
-              active: loading,
+              active: loading
             })}
           >
             <div class="loader" />
@@ -1241,9 +1241,9 @@ class TuyaDeviceBox extends Component {
                       <Text id="global.emptySelectOption" />
                     </option>
                     {housesWithRooms &&
-                      housesWithRooms.map((house) => (
+                      housesWithRooms.map(house => (
                         <optgroup label={house.name}>
-                          {house.rooms.map((room) => (
+                          {house.rooms.map(room => (
                             <option selected={room.id === device.room_id} value={room.id}>
                               {room.name}
                             </option>

From c49d6e99baa3a8d3f0ebbc3900798627f67c9f11 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 19:25:21 +0100
Subject: [PATCH 44/90] fix(tuya): harden init reconnect flag and thing model
 parsing

---
 server/services/tuya/lib/tuya.init.js              |  3 ++-
 server/services/tuya/lib/tuya.loadDeviceDetails.js | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/server/services/tuya/lib/tuya.init.js b/server/services/tuya/lib/tuya.init.js
index 18419a8bcd..4311b80994 100644
--- a/server/services/tuya/lib/tuya.init.js
+++ b/server/services/tuya/lib/tuya.init.js
@@ -16,11 +16,11 @@ async function init() {
   );
   const currentHash = configuration ? buildConfigHash(configuration) : null;
   const hasMatchingConfig = Boolean(lastConnectedHash && currentHash && lastConnectedHash === currentHash);
-  this.autoReconnectAllowed = hasMatchingConfig;
   const manualDisconnect = await this.gladys.variable.getValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, this.serviceId);
   const manualDisconnectEnabled = normalizeBoolean(manualDisconnect);
 
   if (manualDisconnectEnabled) {
+    this.autoReconnectAllowed = false;
     this.status = STATUS.NOT_INITIALIZED;
     this.lastError = null;
     this.gladys.event.emit(EVENTS.WEBSOCKET.SEND_ALL, {
@@ -29,6 +29,7 @@ async function init() {
     });
     return;
   }
+  this.autoReconnectAllowed = hasMatchingConfig;
 
   await this.connect(configuration);
 }
diff --git a/server/services/tuya/lib/tuya.loadDeviceDetails.js b/server/services/tuya/lib/tuya.loadDeviceDetails.js
index 99e3fa4fad..3404cd4da9 100644
--- a/server/services/tuya/lib/tuya.loadDeviceDetails.js
+++ b/server/services/tuya/lib/tuya.loadDeviceDetails.js
@@ -53,16 +53,18 @@ async function loadDeviceDetails(tuyaDevice) {
   const details = detailsResult.status === 'fulfilled' ? detailsResult.value.result || {} : {};
   const properties = propsResult.status === 'fulfilled' ? propsResult.value.result || {} : {};
   const modelPayload = modelResult.status === 'fulfilled' ? modelResult.value.result || null : null;
+  const rawModel =
+    modelPayload && Object.prototype.hasOwnProperty.call(modelPayload, 'model') ? modelPayload.model : modelPayload;
   let thingModel = null;
-  if (modelPayload && typeof modelPayload.model === 'string') {
+  if (typeof rawModel === 'string') {
     try {
-      thingModel = JSON.parse(modelPayload.model);
+      thingModel = JSON.parse(rawModel);
     } catch (e) {
       logger.warn(`[Tuya] Invalid thing model JSON for ${deviceId}`, e);
       thingModel = null;
     }
-  } else if (modelPayload) {
-    thingModel = modelPayload;
+  } else if (rawModel && typeof rawModel === 'object') {
+    thingModel = rawModel;
   }
 
   const category = details.category || tuyaDevice.category;

From 546b9017c7401a96e4978aefd5073b6f2cdf0842 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 19:57:04 +0100
Subject: [PATCH 45/90] fix(tuya): avoid stale state reads in setup save flow

---
 .../integration/all/tuya/setup-page/SetupTab.jsx     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 4aadcfd29c..0e1d5ae080 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -130,6 +130,12 @@ class SetupTab extends Component {
 
   saveTuyaConfiguration = async e => {
     e.preventDefault();
+    const tuyaEndpoint = (this.state.tuyaEndpoint || '').trim();
+    const tuyaAccessKey = (this.state.tuyaAccessKey || '').trim();
+    const tuyaSecretKey = (this.state.tuyaSecretKey || '').trim();
+    const tuyaAppAccountId = (this.state.tuyaAppAccountId || '').trim();
+    const tuyaAppUsername = (this.state.tuyaAppUsername || '').trim();
+
     this.setState({
       tuyaSaveSettingsStatus: RequestStatus.Getting,
       tuyaConnectionStatus: null,
@@ -143,12 +149,6 @@ class SetupTab extends Component {
       tuyaJustSavedMissing: false
     });
     try {
-      const tuyaEndpoint = (this.state.tuyaEndpoint || '').trim();
-      const tuyaAccessKey = (this.state.tuyaAccessKey || '').trim();
-      const tuyaSecretKey = (this.state.tuyaSecretKey || '').trim();
-      const tuyaAppAccountId = (this.state.tuyaAppAccountId || '').trim();
-      const tuyaAppUsername = (this.state.tuyaAppUsername || '').trim();
-
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_ENDPOINT', {
         value: tuyaEndpoint
       });

From b67b2a8a70496856a6640b4da46824391b8da50e Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 19:58:12 +0100
Subject: [PATCH 46/90] chore(front): apply prettier formatting on tuya setup
 tab

---
 .../all/tuya/setup-page/SetupTab.jsx          | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 0e1d5ae080..a29f3b54ec 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -22,7 +22,7 @@ class SetupTab extends Component {
       tuyaJustSavedMissing: false,
       tuyaDisconnecting: false,
       tuyaStatusLoading: false,
-      showClientSecret: false
+      showClientSecret: false,
     };
   }
 
@@ -51,7 +51,7 @@ class SetupTab extends Component {
       tuyaAccessKey,
       tuyaSecretKey,
       tuyaAppAccountId,
-      tuyaAppUsername
+      tuyaAppUsername,
     });
     const getVariable = async (name, fallback = '') => {
       try {
@@ -68,7 +68,7 @@ class SetupTab extends Component {
         getVariable('TUYA_ACCESS_KEY'),
         getVariable('TUYA_SECRET_KEY'),
         getVariable('TUYA_APP_ACCOUNT_UID'),
-        getVariable('TUYA_APP_USERNAME')
+        getVariable('TUYA_APP_USERNAME'),
       ]);
 
       this.setState({
@@ -78,7 +78,7 @@ class SetupTab extends Component {
         tuyaSecretKey,
         tuyaAppAccountId,
         tuyaAppUsername,
-        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId)
+        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId),
       });
     } catch (e) {
       this.setState({
@@ -88,14 +88,14 @@ class SetupTab extends Component {
         tuyaSecretKey,
         tuyaAppAccountId,
         tuyaAppUsername,
-        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId)
+        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId),
       });
     }
   }
 
   async getTuyaStatus() {
     this.setState({
-      tuyaStatusLoading: true
+      tuyaStatusLoading: true,
     });
     try {
       const response = await this.props.httpClient.get('/api/v1/service/tuya/status');
@@ -119,16 +119,16 @@ class SetupTab extends Component {
         tuyaJustSaved: false,
         tuyaJustSavedMissing: false,
         tuyaConnectionStatus: isManualDisconnect ? null : isError ? RequestStatus.Error : null,
-        tuyaConnectionError: isManualDisconnect ? null : isError ? response.error : null
+        tuyaConnectionError: isManualDisconnect ? null : isError ? response.error : null,
       });
     } catch (e) {
       this.setState({
-        tuyaStatusLoading: false
+        tuyaStatusLoading: false,
       });
     }
   }
 
-  saveTuyaConfiguration = async e => {
+  saveTuyaConfiguration = async (e) => {
     e.preventDefault();
     const tuyaEndpoint = (this.state.tuyaEndpoint || '').trim();
     const tuyaAccessKey = (this.state.tuyaAccessKey || '').trim();
@@ -146,35 +146,35 @@ class SetupTab extends Component {
       tuyaManuallyDisconnected: false,
       tuyaManualDisconnectJustDone: false,
       tuyaJustSaved: true,
-      tuyaJustSavedMissing: false
+      tuyaJustSavedMissing: false,
     });
     try {
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_ENDPOINT', {
-        value: tuyaEndpoint
+        value: tuyaEndpoint,
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_ACCESS_KEY', {
-        value: tuyaAccessKey
+        value: tuyaAccessKey,
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_SECRET_KEY', {
-        value: tuyaSecretKey
+        value: tuyaSecretKey,
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_APP_ACCOUNT_UID', {
-        value: tuyaAppAccountId
+        value: tuyaAppAccountId,
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_APP_USERNAME', {
-        value: tuyaAppUsername
+        value: tuyaAppUsername,
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_LAST_CONNECTED_CONFIG_HASH', {
-        value: ''
+        value: '',
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_MANUAL_DISCONNECT', {
-        value: 'false'
+        value: 'false',
       });
 
       const configured = !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId);
@@ -184,7 +184,7 @@ class SetupTab extends Component {
           tuyaConfigured: false,
           tuyaDisconnected: true,
           tuyaJustSavedMissing: true,
-          tuyaJustSaved: false
+          tuyaJustSaved: false,
         });
         return;
       }
@@ -196,7 +196,7 @@ class SetupTab extends Component {
       }
       this.setState({
         tuyaSaveSettingsStatus: RequestStatus.Success,
-        tuyaConfigured: true
+        tuyaConfigured: true,
       });
     } catch (e) {
       const responseMessage =
@@ -206,12 +206,12 @@ class SetupTab extends Component {
         tuyaSaveSettingsStatus: RequestStatus.Error,
         tuyaConnectionError: responseMessage,
         tuyaJustSaved: false,
-        tuyaJustSavedMissing: false
+        tuyaJustSavedMissing: false,
       });
     }
   };
 
-  updateConnectionStatus = event => {
+  updateConnectionStatus = (event) => {
     const status = event && event.status;
     const error = event && event.error;
     const manualDisconnect = event && event.manual_disconnect;
@@ -223,7 +223,7 @@ class SetupTab extends Component {
         tuyaDisconnected: false,
         tuyaManuallyDisconnected: false,
         tuyaManualDisconnectJustDone: false,
-        tuyaJustSavedMissing: false
+        tuyaJustSavedMissing: false,
       });
       return;
     }
@@ -236,7 +236,7 @@ class SetupTab extends Component {
         tuyaDisconnected: false,
         tuyaManuallyDisconnected: false,
         tuyaManualDisconnectJustDone: false,
-        tuyaJustSavedMissing: false
+        tuyaJustSavedMissing: false,
       });
       return;
     }
@@ -249,7 +249,7 @@ class SetupTab extends Component {
         tuyaManuallyDisconnected: false,
         tuyaManualDisconnectJustDone: false,
         tuyaJustSavedMissing: false,
-        tuyaConnectionError: error || this.state.tuyaConnectionError
+        tuyaConnectionError: error || this.state.tuyaConnectionError,
       });
       return;
     }
@@ -261,22 +261,22 @@ class SetupTab extends Component {
         tuyaDisconnected: !manualDisconnect,
         tuyaManuallyDisconnected: !!manualDisconnect,
         tuyaManualDisconnectJustDone: manualDisconnect ? this.state.tuyaManualDisconnectJustDone : false,
-        tuyaJustSavedMissing: false
+        tuyaJustSavedMissing: false,
       });
     }
   };
 
-  displayConnectionError = error => {
+  displayConnectionError = (error) => {
     const message = (error && error.message) || (error && error.payload && error.payload.message);
     this.setState({
       tuyaConnectionStatus: RequestStatus.Error,
       tuyaConnectionError: message || 'unknown',
       tuyaConnecting: false,
-      tuyaConnected: false
+      tuyaConnected: false,
     });
   };
 
-  renderTuyaError = error => {
+  renderTuyaError = (error) => {
     if (!error) {
       return null;
     }
@@ -286,9 +286,9 @@ class SetupTab extends Component {
     return <code>{error}</code>;
   };
 
-  updateConfiguration = e => {
+  updateConfiguration = (e) => {
     const { name, value } = e.target;
-    this.setState(prevState => {
+    this.setState((prevState) => {
       const nextState = { ...prevState, [name]: value };
       const configured = !!(
         nextState.tuyaEndpoint &&
@@ -298,21 +298,21 @@ class SetupTab extends Component {
       );
       return {
         [name]: value,
-        tuyaConfigured: configured
+        tuyaConfigured: configured,
       };
     });
   };
 
   toggleClientSecret = () => {
     this.setState({
-      showClientSecret: !this.state.showClientSecret
+      showClientSecret: !this.state.showClientSecret,
     });
   };
 
   disconnectFromCloud = async () => {
     this.setState({
       tuyaDisconnecting: true,
-      tuyaConnectionError: null
+      tuyaConnectionError: null,
     });
     try {
       await this.props.httpClient.post('/api/v1/service/tuya/disconnect');
@@ -323,13 +323,13 @@ class SetupTab extends Component {
         tuyaDisconnected: false,
         tuyaManuallyDisconnected: true,
         tuyaManualDisconnectJustDone: true,
-        tuyaConnectionStatus: null
+        tuyaConnectionStatus: null,
       });
     } catch (e) {
       this.setState({
         tuyaDisconnecting: false,
         tuyaConnectionStatus: RequestStatus.Error,
-        tuyaConnectionError: (e && e.message) || 'unknown'
+        tuyaConnectionError: (e && e.message) || 'unknown',
       });
     }
   };
@@ -345,7 +345,7 @@ class SetupTab extends Component {
         <div class="card-body">
           <div
             class={cx('dimmer', {
-              active: state.tuyaSaveSettingsStatus === RequestStatus.Getting
+              active: state.tuyaSaveSettingsStatus === RequestStatus.Getting,
             })}
           >
             <div class="loader" />
@@ -493,7 +493,7 @@ class SetupTab extends Component {
                       <i
                         class={cx('fe', {
                           'fe-eye': !state.showClientSecret,
-                          'fe-eye-off': state.showClientSecret
+                          'fe-eye-off': state.showClientSecret,
                         })}
                       />
                     </span>

From 515c9a91aae7dce261f90bc59028afadf79c8235 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 20:30:10 +0100
Subject: [PATCH 47/90] test(tuya): prefer await style in local poll timeout
 test

---
 server/test/services/tuya/lib/tuya.localPoll.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index 232872ee41..d4bf90fb25 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -172,10 +172,10 @@ describe('TuyaHandler.localPoll', () => {
       const errorPromise = (async () => {
         try {
           await promise;
+          return null;
         } catch (error) {
           return error;
         }
-        return null;
       })();
       await clock.tickAsync(1100);
       const error = await errorPromise;

From d4a747ceae81680d6d6593cdf57ba5287634d1ff Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 20:50:30 +0100
Subject: [PATCH 48/90] fix(tuya): align mapping-core with baseline/protocol
 hardening

---
 front/src/config/i18n/de.json                              | 6 +++---
 .../routes/integration/all/tuya/setup-page/SetupTab.jsx    | 2 +-
 server/services/tuya/lib/tuya.localPoll.js                 | 6 ++++--
 server/services/tuya/lib/tuya.localScan.js                 | 3 ++-
 server/services/tuya/lib/tuya.setValue.js                  | 5 ++++-
 server/test/services/tuya/lib/tuya.setValue.test.js        | 7 +++----
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 36301fa8da..7b43f9b6c6 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1222,11 +1222,11 @@
         "ipModeCloud": "Cloud",
         "localInfoHelp": "Mit der Cloud/Lokal-Schaltfläche wählst du den Kommunikationsmodus. Im lokalen Modus kannst du die lokale IP bearbeiten. Im Cloud-Modus wird die Cloud-IP nur angezeigt (schreibgeschützt).",
         "localPollButton": "Lokales DPS abfragen",
-        "localPollInProgress": "Lokaler Poll läuft... Protokoll {{protocol}}.",
+        "localPollInProgress": "Lokale Abfrage läuft... Protokoll {{protocol}}.",
         "localPollHelp": "Wenn du das Protokoll kennst, wähle es aus und klicke zum Prüfen. Wenn nicht, klicke direkt für einen vollständigen Scan (dauert länger).",
         "localPollRequired": "Lokaler Modus ist aktiv und lokale Einstellungen wurden geändert. Bitte \"Lokales DPS abfragen\" erfolgreich ausführen, bevor du speicherst. Wenn der lokale Modus nicht funktioniert, schalte zurück in den Cloud-Modus.",
-        "localPollSuccess": "Lokaler Poll OK.",
-        "localPollError": "Lokaler Poll fehlgeschlagen:",
+        "localPollSuccess": "Lokale Abfrage OK.",
+        "localPollError": "Lokale Abfrage fehlgeschlagen:",
         "productIdLabel": "Produkt-ID",
         "productKeyLabel": "Produktschlüssel",
         "createGithubIssue": "Dieses Gerät vorschlagen",
diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index a29f3b54ec..b0ad772827 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -485,7 +485,7 @@ class SetupTab extends Component {
                         placeholder={<Text id="integration.tuya.setup.secretKeyPlaceholder" />}
                         value={state.tuyaSecretKey}
                         className="form-control"
-                        autocomplete="off"
+                        autoComplete="off"
                         onInput={this.updateConfiguration}
                       />
                     </Localizer>
diff --git a/server/services/tuya/lib/tuya.localPoll.js b/server/services/tuya/lib/tuya.localPoll.js
index 82fd9c373b..f21e89e249 100644
--- a/server/services/tuya/lib/tuya.localPoll.js
+++ b/server/services/tuya/lib/tuya.localPoll.js
@@ -34,7 +34,7 @@ async function localPoll(payload) {
     issueRefreshOnPing: false,
   };
   if (isProtocol35) {
-    tuyaOptions.KeepAlive = false;
+    tuyaOptions.keepAlive = false;
     tuyaOptions.socketTimeout = Math.max(effectiveTimeout, 5000);
   }
   const tuyaLocal = new TuyaLocalApi(tuyaOptions);
@@ -160,7 +160,9 @@ function updateDiscoveredDeviceAfterLocalPoll(tuyaManager, payload) {
   device.params = Array.isArray(device.params) ? [...device.params] : [];
   upsertParam(device.params, DEVICE_PARAM_NAME.IP_ADDRESS, ip);
   upsertParam(device.params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, protocolVersion);
-  upsertParam(device.params, DEVICE_PARAM_NAME.LOCAL_KEY, localKey);
+  if (localKey) {
+    upsertParam(device.params, DEVICE_PARAM_NAME.LOCAL_KEY, localKey);
+  }
   upsertParam(device.params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE, true);
   upsertParam(device.params, DEVICE_PARAM_NAME.PRODUCT_ID, device.product_id);
   upsertParam(device.params, DEVICE_PARAM_NAME.PRODUCT_KEY, device.product_key);
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index 01145dde3f..512a031ea4 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -20,7 +20,8 @@ const DEFAULT_PORTS = [6666, 6667, 7000];
  */
 async function localScan(input = 10) {
   const options = typeof input === 'object' ? input || {} : { timeoutSeconds: input };
-  const timeoutSeconds = options.timeoutSeconds || 10;
+  const parsedTimeout = Number(options.timeoutSeconds);
+  const timeoutSeconds = Number.isFinite(parsedTimeout) ? Math.min(Math.max(parsedTimeout, 1), 30) : 10;
   const devices = {};
   const portErrors = {};
   const sockets = [];
diff --git a/server/services/tuya/lib/tuya.setValue.js b/server/services/tuya/lib/tuya.setValue.js
index b78a266f7f..a47b242645 100644
--- a/server/services/tuya/lib/tuya.setValue.js
+++ b/server/services/tuya/lib/tuya.setValue.js
@@ -27,6 +27,9 @@ async function setValue(device, deviceFeature, value) {
   if (!topic || topic.length === 0) {
     throw new BadParameters(`Tuya device external_id is invalid: "${externalId}" have no network indicator`);
   }
+  if (!command || command.trim().length === 0) {
+    throw new BadParameters(`Tuya device external_id is invalid: "${externalId}" have no command`);
+  }
 
   const writeCategory = writeValues[deviceFeature.category];
   const writeFn = writeCategory ? writeCategory[deviceFeature.type] : null;
@@ -58,7 +61,7 @@ async function setValue(device, deviceFeature, value) {
       issueRefreshOnPing: false,
     };
     if (isProtocol35) {
-      tuyaOptions.KeepAlive = false;
+      tuyaOptions.keepAlive = false;
     }
     const runLocalSet = async () => {
       const tuyaLocal = new TuyaLocalApi(tuyaOptions);
diff --git a/server/test/services/tuya/lib/tuya.setValue.test.js b/server/test/services/tuya/lib/tuya.setValue.test.js
index 7045e584b8..3c0e745351 100644
--- a/server/test/services/tuya/lib/tuya.setValue.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.test.js
@@ -341,7 +341,7 @@ describe('TuyaHandler.setValue', () => {
     expect(ctx.connector.request.calledOnce).to.equal(true);
   });
 
-  it('should fallback to cloud when command is empty', async () => {
+  it('should throw when command is empty', async () => {
     const device = {
       params: [
         { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '10.0.0.2' },
@@ -361,9 +361,8 @@ describe('TuyaHandler.setValue', () => {
       gladys: {},
     };
 
-    await tuyaHandler.setValue.call(ctx, device, deviceFeature, 1);
-
-    expect(ctx.connector.request.calledOnce).to.equal(true);
+    await expect(tuyaHandler.setValue.call(ctx, device, deviceFeature, 1)).to.be.rejectedWith('have no command');
+    expect(ctx.connector.request.called).to.equal(false);
   });
 
   it('should log disconnect failures and still return on local success', async () => {

From a57fc3c0a840a17ebb8368c50d07aa33e3c374e6 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 21:02:12 +0100
Subject: [PATCH 49/90] chore(front): apply prettier formatting on tuya setup
 tab

---
 .../all/tuya/setup-page/SetupTab.jsx          | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index b0ad772827..0bb4904d72 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -22,7 +22,7 @@ class SetupTab extends Component {
       tuyaJustSavedMissing: false,
       tuyaDisconnecting: false,
       tuyaStatusLoading: false,
-      showClientSecret: false,
+      showClientSecret: false
     };
   }
 
@@ -51,7 +51,7 @@ class SetupTab extends Component {
       tuyaAccessKey,
       tuyaSecretKey,
       tuyaAppAccountId,
-      tuyaAppUsername,
+      tuyaAppUsername
     });
     const getVariable = async (name, fallback = '') => {
       try {
@@ -68,7 +68,7 @@ class SetupTab extends Component {
         getVariable('TUYA_ACCESS_KEY'),
         getVariable('TUYA_SECRET_KEY'),
         getVariable('TUYA_APP_ACCOUNT_UID'),
-        getVariable('TUYA_APP_USERNAME'),
+        getVariable('TUYA_APP_USERNAME')
       ]);
 
       this.setState({
@@ -78,7 +78,7 @@ class SetupTab extends Component {
         tuyaSecretKey,
         tuyaAppAccountId,
         tuyaAppUsername,
-        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId),
+        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId)
       });
     } catch (e) {
       this.setState({
@@ -88,14 +88,14 @@ class SetupTab extends Component {
         tuyaSecretKey,
         tuyaAppAccountId,
         tuyaAppUsername,
-        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId),
+        tuyaConfigured: !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId)
       });
     }
   }
 
   async getTuyaStatus() {
     this.setState({
-      tuyaStatusLoading: true,
+      tuyaStatusLoading: true
     });
     try {
       const response = await this.props.httpClient.get('/api/v1/service/tuya/status');
@@ -119,16 +119,16 @@ class SetupTab extends Component {
         tuyaJustSaved: false,
         tuyaJustSavedMissing: false,
         tuyaConnectionStatus: isManualDisconnect ? null : isError ? RequestStatus.Error : null,
-        tuyaConnectionError: isManualDisconnect ? null : isError ? response.error : null,
+        tuyaConnectionError: isManualDisconnect ? null : isError ? response.error : null
       });
     } catch (e) {
       this.setState({
-        tuyaStatusLoading: false,
+        tuyaStatusLoading: false
       });
     }
   }
 
-  saveTuyaConfiguration = async (e) => {
+  saveTuyaConfiguration = async e => {
     e.preventDefault();
     const tuyaEndpoint = (this.state.tuyaEndpoint || '').trim();
     const tuyaAccessKey = (this.state.tuyaAccessKey || '').trim();
@@ -146,35 +146,35 @@ class SetupTab extends Component {
       tuyaManuallyDisconnected: false,
       tuyaManualDisconnectJustDone: false,
       tuyaJustSaved: true,
-      tuyaJustSavedMissing: false,
+      tuyaJustSavedMissing: false
     });
     try {
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_ENDPOINT', {
-        value: tuyaEndpoint,
+        value: tuyaEndpoint
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_ACCESS_KEY', {
-        value: tuyaAccessKey,
+        value: tuyaAccessKey
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_SECRET_KEY', {
-        value: tuyaSecretKey,
+        value: tuyaSecretKey
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_APP_ACCOUNT_UID', {
-        value: tuyaAppAccountId,
+        value: tuyaAppAccountId
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_APP_USERNAME', {
-        value: tuyaAppUsername,
+        value: tuyaAppUsername
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_LAST_CONNECTED_CONFIG_HASH', {
-        value: '',
+        value: ''
       });
 
       await this.props.httpClient.post('/api/v1/service/tuya/variable/TUYA_MANUAL_DISCONNECT', {
-        value: 'false',
+        value: 'false'
       });
 
       const configured = !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId);
@@ -184,7 +184,7 @@ class SetupTab extends Component {
           tuyaConfigured: false,
           tuyaDisconnected: true,
           tuyaJustSavedMissing: true,
-          tuyaJustSaved: false,
+          tuyaJustSaved: false
         });
         return;
       }
@@ -196,7 +196,7 @@ class SetupTab extends Component {
       }
       this.setState({
         tuyaSaveSettingsStatus: RequestStatus.Success,
-        tuyaConfigured: true,
+        tuyaConfigured: true
       });
     } catch (e) {
       const responseMessage =
@@ -206,12 +206,12 @@ class SetupTab extends Component {
         tuyaSaveSettingsStatus: RequestStatus.Error,
         tuyaConnectionError: responseMessage,
         tuyaJustSaved: false,
-        tuyaJustSavedMissing: false,
+        tuyaJustSavedMissing: false
       });
     }
   };
 
-  updateConnectionStatus = (event) => {
+  updateConnectionStatus = event => {
     const status = event && event.status;
     const error = event && event.error;
     const manualDisconnect = event && event.manual_disconnect;
@@ -223,7 +223,7 @@ class SetupTab extends Component {
         tuyaDisconnected: false,
         tuyaManuallyDisconnected: false,
         tuyaManualDisconnectJustDone: false,
-        tuyaJustSavedMissing: false,
+        tuyaJustSavedMissing: false
       });
       return;
     }
@@ -236,7 +236,7 @@ class SetupTab extends Component {
         tuyaDisconnected: false,
         tuyaManuallyDisconnected: false,
         tuyaManualDisconnectJustDone: false,
-        tuyaJustSavedMissing: false,
+        tuyaJustSavedMissing: false
       });
       return;
     }
@@ -249,7 +249,7 @@ class SetupTab extends Component {
         tuyaManuallyDisconnected: false,
         tuyaManualDisconnectJustDone: false,
         tuyaJustSavedMissing: false,
-        tuyaConnectionError: error || this.state.tuyaConnectionError,
+        tuyaConnectionError: error || this.state.tuyaConnectionError
       });
       return;
     }
@@ -261,22 +261,22 @@ class SetupTab extends Component {
         tuyaDisconnected: !manualDisconnect,
         tuyaManuallyDisconnected: !!manualDisconnect,
         tuyaManualDisconnectJustDone: manualDisconnect ? this.state.tuyaManualDisconnectJustDone : false,
-        tuyaJustSavedMissing: false,
+        tuyaJustSavedMissing: false
       });
     }
   };
 
-  displayConnectionError = (error) => {
+  displayConnectionError = error => {
     const message = (error && error.message) || (error && error.payload && error.payload.message);
     this.setState({
       tuyaConnectionStatus: RequestStatus.Error,
       tuyaConnectionError: message || 'unknown',
       tuyaConnecting: false,
-      tuyaConnected: false,
+      tuyaConnected: false
     });
   };
 
-  renderTuyaError = (error) => {
+  renderTuyaError = error => {
     if (!error) {
       return null;
     }
@@ -286,9 +286,9 @@ class SetupTab extends Component {
     return <code>{error}</code>;
   };
 
-  updateConfiguration = (e) => {
+  updateConfiguration = e => {
     const { name, value } = e.target;
-    this.setState((prevState) => {
+    this.setState(prevState => {
       const nextState = { ...prevState, [name]: value };
       const configured = !!(
         nextState.tuyaEndpoint &&
@@ -298,21 +298,21 @@ class SetupTab extends Component {
       );
       return {
         [name]: value,
-        tuyaConfigured: configured,
+        tuyaConfigured: configured
       };
     });
   };
 
   toggleClientSecret = () => {
     this.setState({
-      showClientSecret: !this.state.showClientSecret,
+      showClientSecret: !this.state.showClientSecret
     });
   };
 
   disconnectFromCloud = async () => {
     this.setState({
       tuyaDisconnecting: true,
-      tuyaConnectionError: null,
+      tuyaConnectionError: null
     });
     try {
       await this.props.httpClient.post('/api/v1/service/tuya/disconnect');
@@ -323,13 +323,13 @@ class SetupTab extends Component {
         tuyaDisconnected: false,
         tuyaManuallyDisconnected: true,
         tuyaManualDisconnectJustDone: true,
-        tuyaConnectionStatus: null,
+        tuyaConnectionStatus: null
       });
     } catch (e) {
       this.setState({
         tuyaDisconnecting: false,
         tuyaConnectionStatus: RequestStatus.Error,
-        tuyaConnectionError: (e && e.message) || 'unknown',
+        tuyaConnectionError: (e && e.message) || 'unknown'
       });
     }
   };
@@ -345,7 +345,7 @@ class SetupTab extends Component {
         <div class="card-body">
           <div
             class={cx('dimmer', {
-              active: state.tuyaSaveSettingsStatus === RequestStatus.Getting,
+              active: state.tuyaSaveSettingsStatus === RequestStatus.Getting
             })}
           >
             <div class="loader" />
@@ -493,7 +493,7 @@ class SetupTab extends Component {
                       <i
                         class={cx('fe', {
                           'fe-eye': !state.showClientSecret,
-                          'fe-eye-off': state.showClientSecret,
+                          'fe-eye-off': state.showClientSecret
                         })}
                       />
                     </span>

From a81f8ad9a7cbbd7c11b9f97fc964be064efd416b Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 18:52:44 +0100
Subject: [PATCH 50/90] fix(tuya): harden setup state updates and fix
 disconnect log typo

---
 .../all/tuya/setup-page/SetupTab.jsx          | 20 +++++++++----------
 server/services/tuya/lib/tuya.disconnect.js   |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 0bb4904d72..17a5b696dd 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -241,28 +241,28 @@ class SetupTab extends Component {
       return;
     }
     if (status === 'error') {
-      this.setState({
+      this.setState(previousState => ({
         tuyaConnectionStatus: RequestStatus.Error,
         tuyaConnecting: false,
         tuyaConnected: false,
-        tuyaDisconnected: this.state.tuyaConfigured && !manualDisconnect,
+        tuyaDisconnected: previousState.tuyaConfigured && !manualDisconnect,
         tuyaManuallyDisconnected: false,
         tuyaManualDisconnectJustDone: false,
         tuyaJustSavedMissing: false,
-        tuyaConnectionError: error || this.state.tuyaConnectionError
-      });
+        tuyaConnectionError: error || previousState.tuyaConnectionError
+      }));
       return;
     }
     if (status === 'not_initialized') {
-      this.setState({
+      this.setState(previousState => ({
         tuyaConnectionStatus: null,
         tuyaConnecting: false,
         tuyaConnected: false,
         tuyaDisconnected: !manualDisconnect,
         tuyaManuallyDisconnected: !!manualDisconnect,
-        tuyaManualDisconnectJustDone: manualDisconnect ? this.state.tuyaManualDisconnectJustDone : false,
+        tuyaManualDisconnectJustDone: manualDisconnect ? previousState.tuyaManualDisconnectJustDone : false,
         tuyaJustSavedMissing: false
-      });
+      }));
     }
   };
 
@@ -304,9 +304,9 @@ class SetupTab extends Component {
   };
 
   toggleClientSecret = () => {
-    this.setState({
-      showClientSecret: !this.state.showClientSecret
-    });
+    this.setState(previousState => ({
+      showClientSecret: !previousState.showClientSecret
+    }));
   };
 
   disconnectFromCloud = async () => {
diff --git a/server/services/tuya/lib/tuya.disconnect.js b/server/services/tuya/lib/tuya.disconnect.js
index e54706128d..23edccbf76 100644
--- a/server/services/tuya/lib/tuya.disconnect.js
+++ b/server/services/tuya/lib/tuya.disconnect.js
@@ -10,7 +10,7 @@ const { STATUS } = require('./utils/tuya.constants');
  * disconnect();
  */
 function disconnect(options = {}) {
-  logger.debug('Disonnecting from Tuya...');
+  logger.debug('Disconnecting from Tuya...');
   const { manual = false } = options;
   this.connector = null;
   this.status = STATUS.NOT_INITIALIZED;

From de856943894cd3eab44dfb125b675d5359159e57 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Fri, 27 Feb 2026 19:51:12 +0100
Subject: [PATCH 51/90] fix(tuya): harden mapping-core poll and specification
 extraction

---
 server/services/tuya/lib/mappings/index.js            |  3 ++-
 server/services/tuya/lib/tuya.poll.js                 | 11 ++++++++---
 .../services/tuya/lib/utils/tuya.deviceParams.test.js |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/server/services/tuya/lib/mappings/index.js b/server/services/tuya/lib/mappings/index.js
index 2c326766c0..30ee74068f 100644
--- a/server/services/tuya/lib/mappings/index.js
+++ b/server/services/tuya/lib/mappings/index.js
@@ -112,8 +112,9 @@ const extractCodesFromSpecifications = (specifications) => {
   }
   const functions = Array.isArray(specifications.functions) ? specifications.functions : [];
   const status = Array.isArray(specifications.status) ? specifications.status : [];
+  const properties = Array.isArray(specifications.properties) ? specifications.properties : [];
 
-  [...functions, ...status].forEach((item) => {
+  [...functions, ...status, ...properties].forEach((item) => {
     if (!item || !item.code) {
       return;
     }
diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index 6ad5395bac..22c9d879b3 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -104,6 +104,9 @@ const pollCloudFeatures = async function pollCloudFeatures(deviceFeatures, topic
     missing: 0,
     skipped: 0,
   };
+  if (!Array.isArray(deviceFeatures) || deviceFeatures.length === 0) {
+    return summary;
+  }
 
   if (!this.connector || typeof this.connector.request !== 'function') {
     logger.warn(`[Tuya][poll][cloud] connector unavailable for device=${topic}`);
@@ -116,7 +119,8 @@ const pollCloudFeatures = async function pollCloudFeatures(deviceFeatures, topic
   });
 
   const values = {};
-  (response.result || []).forEach((feature) => {
+  const result = Array.isArray(response && response.result) ? response.result : [];
+  result.forEach((feature) => {
     values[feature.code] = feature.value;
   });
 
@@ -170,6 +174,7 @@ async function poll(device) {
   }
 
   const params = device.params || [];
+  const deviceFeatures = Array.isArray(device.features) ? device.features : [];
   const ipAddress = getParamValue(params, DEVICE_PARAM_NAME.IP_ADDRESS);
   const localKey = getParamValue(params, DEVICE_PARAM_NAME.LOCAL_KEY);
   const protocolVersionRaw = getParamValue(params, DEVICE_PARAM_NAME.PROTOCOL_VERSION);
@@ -219,7 +224,7 @@ async function poll(device) {
       if (dps && typeof dps === 'object') {
         const pendingCloudFeatures = [];
 
-        device.features.forEach((deviceFeature) => {
+        deviceFeatures.forEach((deviceFeature) => {
           const code = getFeatureCode(deviceFeature);
           const dpsKey = getLocalDpsFromCode(code, device);
           const reader = getFeatureReader(deviceFeature);
@@ -278,7 +283,7 @@ async function poll(device) {
     }
   }
 
-  cloudSummary = await pollCloudFeatures.call(this, device.features, topic);
+  cloudSummary = await pollCloudFeatures.call(this, deviceFeatures, topic);
   logger.debug(
     `[Tuya][poll] device=${topic} mode=${modeUsed} local_handled=${localHandled} local_changed=${localChanged} cloud_handled=${cloudSummary.handled} cloud_changed=${cloudSummary.changed} cloud_missing=${cloudSummary.missing} fallback=${fallbackReason}`,
   );
diff --git a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
index d041414281..ff30e16be6 100644
--- a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
+++ b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
@@ -27,7 +27,7 @@ describe('Tuya device params utils', () => {
     expect(params).to.deep.equal([{ name: 'test', value: 1 }]);
   });
 
-  it('should get param value', () => {
+  it('should get param value using device param constants', () => {
     const value = getParamValue([{ name: 'A', value: 42 }], 'A');
     expect(value).to.equal(42);
     expect(getParamValue([{ name: 'A', value: 42 }], 'B')).to.equal(undefined);

From 6a5eb55fd0b2eb38161d50a122b17772b8acf608 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 28 Feb 2026 10:37:46 +0100
Subject: [PATCH 52/90] fix(tuya): harden mapping core for thing model fallback
 and scaled values

---
 .../tuya/lib/device/tuya.convertDevice.js     | 50 +++++++++++++++----
 .../tuya/lib/device/tuya.convertFeature.js    |  3 ++
 .../tuya/lib/device/tuya.deviceMapping.js     | 34 ++++++++++---
 server/services/tuya/lib/mappings/index.js    | 37 ++++++++++++++
 .../feature/tuya.convertFeature.test.js       | 18 +++++++
 .../device/feature/tuya.deviceMapping.test.js | 24 +++++++++
 .../lib/device/tuya.convertDevice.test.js     | 41 +++++++++++++++
 .../services/tuya/lib/mappings/index.test.js  | 18 +++++++
 8 files changed, 208 insertions(+), 17 deletions(-)

diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index e74ec6946b..d3b0d32cd9 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -73,7 +73,18 @@ function convertDevice(tuyaDevice) {
   logger.debug(JSON.stringify(safeDeviceLog));
 
   logger.debug(`Tuya convert device "${name}, ${productName || model}"`);
-  // Groups functions and status on same code
+  const deviceType = getDeviceType({
+    specifications,
+    model,
+    product_name: productName,
+    product_id: productId,
+    name,
+    category: specifications.category || category,
+    properties,
+    thing_model: thingModel,
+  });
+
+  // Groups cloud specification entries first, then thing model properties, then current property shadow codes.
   const groups = {};
   status.forEach((stat) => {
     const { code } = stat;
@@ -83,15 +94,36 @@ function convertDevice(tuyaDevice) {
     const { code } = func;
     groups[code] = { ...func, readOnly: false };
   });
-
-  const deviceType = getDeviceType({
-    specifications,
-    model,
-    product_name: productName,
-    product_id: productId,
-    name,
-    category: specifications.category || category,
+  const services = Array.isArray(thingModel && thingModel.services) ? thingModel.services : [];
+  services.forEach((service) => {
+    const thingProperties = Array.isArray(service && service.properties) ? service.properties : [];
+    thingProperties.forEach((property) => {
+      const { code } = property || {};
+      if (!code || groups[code]) {
+        return;
+      }
+      groups[code] = {
+        code,
+        name: property.name,
+        values: property.typeSpec || {},
+        readOnly: property.accessMode !== 'rw',
+      };
+    });
   });
+  const currentProperties = Array.isArray(properties && properties.properties) ? properties.properties : [];
+  currentProperties.forEach((property) => {
+    const { code } = property || {};
+    if (!code || groups[code]) {
+      return;
+    }
+    groups[code] = {
+      code,
+      name: property.custom_name || property.name || code,
+      values: {},
+      readOnly: true,
+    };
+  });
+
   const ignoredCloudCodes = getIgnoredCloudCodes(deviceType);
   const ignoredLocalDps = getIgnoredLocalDps(deviceType);
   const features = Object.values(groups).map((group) =>
diff --git a/server/services/tuya/lib/device/tuya.convertFeature.js b/server/services/tuya/lib/device/tuya.convertFeature.js
index 6e045cd1b4..769258ea13 100644
--- a/server/services/tuya/lib/device/tuya.convertFeature.js
+++ b/server/services/tuya/lib/device/tuya.convertFeature.js
@@ -55,6 +55,9 @@ function convertFeature(tuyaFunctions, externalId, options = {}) {
   if ('max' in valuesObject) {
     feature.max = valuesObject.max;
   }
+  if ('scale' in valuesObject) {
+    feature.scale = valuesObject.scale;
+  }
 
   return feature;
 }
diff --git a/server/services/tuya/lib/device/tuya.deviceMapping.js b/server/services/tuya/lib/device/tuya.deviceMapping.js
index 14eaa53212..a608732b2f 100644
--- a/server/services/tuya/lib/device/tuya.deviceMapping.js
+++ b/server/services/tuya/lib/device/tuya.deviceMapping.js
@@ -7,6 +7,24 @@ const OPEN = 'open';
 const CLOSE = 'close';
 const STOP = 'stop';
 
+const getScale = (deviceFeature, defaultScale = 0) => {
+  const parsedScale =
+    deviceFeature && deviceFeature.scale !== undefined && deviceFeature.scale !== null
+      ? parseInt(deviceFeature.scale, 10)
+      : defaultScale;
+
+  return Number.isNaN(parsedScale) ? defaultScale : parsedScale;
+};
+
+const scaleValue = (valueFromDevice, deviceFeature, defaultScale = 0) => {
+  const parsedValue = Number(valueFromDevice);
+  if (Number.isNaN(parsedValue)) {
+    return parsedValue;
+  }
+  const scale = getScale(deviceFeature, defaultScale);
+  return parsedValue / 10 ** scale;
+};
+
 const writeValues = {
   [DEVICE_FEATURE_CATEGORIES.LIGHT]: {
     [DEVICE_FEATURE_TYPES.LIGHT.BINARY]: (valueFromGladys) => {
@@ -74,17 +92,17 @@ const readValues = {
     [DEVICE_FEATURE_TYPES.SWITCH.BINARY]: (valueFromDevice) => {
       return normalizeBoolean(valueFromDevice) ? 1 : 0;
     },
-    [DEVICE_FEATURE_TYPES.SWITCH.ENERGY]: (valueFromDevice) => {
-      return parseInt(valueFromDevice, 10) / 100;
+    [DEVICE_FEATURE_TYPES.SWITCH.ENERGY]: (valueFromDevice, deviceFeature) => {
+      return scaleValue(valueFromDevice, deviceFeature, 2);
     },
-    [DEVICE_FEATURE_TYPES.SWITCH.CURRENT]: (valueFromDevice) => {
-      return parseInt(valueFromDevice, 10);
+    [DEVICE_FEATURE_TYPES.SWITCH.CURRENT]: (valueFromDevice, deviceFeature) => {
+      return scaleValue(valueFromDevice, deviceFeature, 0);
     },
-    [DEVICE_FEATURE_TYPES.SWITCH.POWER]: (valueFromDevice) => {
-      return parseInt(valueFromDevice, 10) / 10;
+    [DEVICE_FEATURE_TYPES.SWITCH.POWER]: (valueFromDevice, deviceFeature) => {
+      return scaleValue(valueFromDevice, deviceFeature, 1);
     },
-    [DEVICE_FEATURE_TYPES.SWITCH.VOLTAGE]: (valueFromDevice) => {
-      return parseInt(valueFromDevice, 10) / 10;
+    [DEVICE_FEATURE_TYPES.SWITCH.VOLTAGE]: (valueFromDevice, deviceFeature) => {
+      return scaleValue(valueFromDevice, deviceFeature, 1);
     },
   },
   [DEVICE_FEATURE_CATEGORIES.CURTAIN]: {
diff --git a/server/services/tuya/lib/mappings/index.js b/server/services/tuya/lib/mappings/index.js
index 30ee74068f..90f603389e 100644
--- a/server/services/tuya/lib/mappings/index.js
+++ b/server/services/tuya/lib/mappings/index.js
@@ -146,6 +146,37 @@ const extractCodesFromFeatures = (features) => {
   return codes;
 };
 
+const extractCodesFromThingModel = (thingModel) => {
+  const codes = new Set();
+  const services = Array.isArray(thingModel && thingModel.services) ? thingModel.services : [];
+
+  services.forEach((service) => {
+    const properties = Array.isArray(service && service.properties) ? service.properties : [];
+    properties.forEach((property) => {
+      if (!property || !property.code) {
+        return;
+      }
+      codes.add(String(property.code).toLowerCase());
+    });
+  });
+
+  return codes;
+};
+
+const extractCodesFromProperties = (propertiesPayload) => {
+  const codes = new Set();
+  const properties = Array.isArray(propertiesPayload && propertiesPayload.properties) ? propertiesPayload.properties : [];
+
+  properties.forEach((property) => {
+    if (!property || !property.code) {
+      return;
+    }
+    codes.add(String(property.code).toLowerCase());
+  });
+
+  return codes;
+};
+
 const getDeviceType = (device) => {
   if (!device || typeof device !== 'object') {
     return DEVICE_TYPES.UNKNOWN;
@@ -153,6 +184,12 @@ const getDeviceType = (device) => {
 
   const specifications = device.specifications || {};
   let codes = extractCodesFromSpecifications(specifications);
+  if (codes.size === 0) {
+    codes = extractCodesFromThingModel(device.thing_model);
+  }
+  if (codes.size === 0) {
+    codes = extractCodesFromProperties(device.properties);
+  }
   if (codes.size === 0) {
     codes = extractCodesFromFeatures(device.features);
   }
diff --git a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
index 10cc0f8609..7ba5a2593d 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
@@ -99,4 +99,22 @@ describe('Tuya convert feature', () => {
       type: 'binary',
     });
   });
+
+  it('should keep scale from values payload', () => {
+    const result = convertFeature(
+      {
+        code: 'cur_power',
+        type: 'Integer',
+        name: 'power',
+        readOnly: true,
+        values: { min: 0, max: 99999, scale: 1 },
+      },
+      'externalId',
+      {
+        deviceType: DEVICE_TYPES.SMART_SOCKET,
+      },
+    );
+
+    expect(result.scale).to.equal(1);
+  });
 });
diff --git a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
index 4884c05036..1e10f2001a 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
@@ -94,18 +94,42 @@ describe('Tuya device mapping', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.ENERGY]('30');
         expect(result).to.eq(0.3);
       });
+      it('energy with explicit scale', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.ENERGY]('30', {
+          scale: 1,
+        });
+        expect(result).to.eq(3);
+      });
       it('current', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.CURRENT]('20');
         expect(result).to.eq(20);
       });
+      it('current with explicit scale', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.CURRENT]('205', {
+          scale: 1,
+        });
+        expect(result).to.eq(20.5);
+      });
       it('power', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.POWER]('2245');
         expect(result).to.eq(224.5);
       });
+      it('power with explicit scale', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.POWER]('2245', {
+          scale: 2,
+        });
+        expect(result).to.eq(22.45);
+      });
       it('voltage', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.VOLTAGE]('120');
         expect(result).to.eq(12.0);
       });
+      it('voltage with explicit scale', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.VOLTAGE]('2352', {
+          scale: 1,
+        });
+        expect(result).to.eq(235.2);
+      });
     });
     describe('curtain state', () => {
       it('open', () => {
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
index f5cc9b7b34..1451b57778 100644
--- a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
@@ -82,4 +82,45 @@ describe('tuya.convertDevice', () => {
     expect(device.specifications).to.deep.equal({});
     expect(device.poll_frequency).to.equal(DEVICE_POLL_FREQUENCIES.EVERY_30_SECONDS);
   });
+
+  it('should build features from thing model when specifications are empty', () => {
+    const tuyaDevice = {
+      id: 'device-id',
+      name: 'Wifi Plug Mini',
+      model: 'Wifi Plug Mini',
+      product_id: 'cya3zxfd38g4qp8d',
+      local_override: true,
+      thing_model: {
+        services: [
+          {
+            properties: [
+              {
+                code: 'switch_1',
+                name: 'Switch 1',
+                accessMode: 'rw',
+                typeSpec: { type: 'bool' },
+              },
+              {
+                code: 'cur_power',
+                name: 'Current Power',
+                accessMode: 'ro',
+                typeSpec: { min: 0, max: 99999, scale: 1, unit: 'W' },
+              },
+            ],
+          },
+        ],
+      },
+      specifications: {},
+    };
+
+    const device = convertDevice.call({ serviceId: 'service-id' }, tuyaDevice);
+
+    expect(device.device_type).to.equal(DEVICE_TYPES.SMART_SOCKET);
+    expect(device.features.map((feature) => feature.external_id)).to.have.members([
+      'tuya:device-id:switch_1',
+      'tuya:device-id:cur_power',
+    ]);
+    expect(device.features.find((feature) => feature.external_id === 'tuya:device-id:cur_power').scale).to.equal(1);
+    expect(device.poll_frequency).to.equal(DEVICE_POLL_FREQUENCIES.EVERY_10_SECONDS);
+  });
 });
diff --git a/server/test/services/tuya/lib/mappings/index.test.js b/server/test/services/tuya/lib/mappings/index.test.js
index ce8e3bbde3..2ad8b3a247 100644
--- a/server/test/services/tuya/lib/mappings/index.test.js
+++ b/server/test/services/tuya/lib/mappings/index.test.js
@@ -89,6 +89,24 @@ describe('Tuya mappings index', () => {
       product_id: 'cya3zxfd38g4qp8d',
     });
     expect(socketByProductId).to.equal(DEVICE_TYPES.SMART_SOCKET);
+
+    const socketByThingModel = getDeviceType({
+      specifications: {},
+      thing_model: {
+        services: [{ properties: [{ code: 'switch_1' }] }],
+      },
+      model: 'Wifi Plug Mini',
+    });
+    expect(socketByThingModel).to.equal(DEVICE_TYPES.SMART_SOCKET);
+
+    const socketByProperties = getDeviceType({
+      specifications: {},
+      properties: {
+        properties: [{ code: 'switch_1' }],
+      },
+      model: 'Wifi Plug Mini',
+    });
+    expect(socketByProperties).to.equal(DEVICE_TYPES.SMART_SOCKET);
   });
 
   it('should get feature mapping and ignore invalid candidates', () => {

From 2a77646bcc5246c136281fa1e1f58ec439acf1b8 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 28 Feb 2026 13:57:02 +0100
Subject: [PATCH 53/90] test(tuya): cover generic mapping core guards

---
 .../device/feature/tuya.deviceMapping.test.js |  6 +++
 .../lib/device/tuya.convertDevice.test.js     | 43 +++++++++++++++++++
 .../tuya/lib/device/tuya.localMapping.test.js |  6 +++
 .../services/tuya/lib/mappings/index.test.js  |  4 +-
 .../test/services/tuya/lib/tuya.poll.test.js  | 10 +++++
 5 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
index 1e10f2001a..246ad9417a 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
@@ -130,6 +130,12 @@ describe('Tuya device mapping', () => {
         });
         expect(result).to.eq(235.2);
       });
+      it('switch power invalid value returns NaN', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.POWER](
+          'not-a-number',
+        );
+        expect(Number.isNaN(result)).to.equal(true);
+      });
     });
     describe('curtain state', () => {
       it('open', () => {
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
index 1451b57778..c7465337fa 100644
--- a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
@@ -123,4 +123,47 @@ describe('tuya.convertDevice', () => {
     expect(device.features.find((feature) => feature.external_id === 'tuya:device-id:cur_power').scale).to.equal(1);
     expect(device.poll_frequency).to.equal(DEVICE_POLL_FREQUENCIES.EVERY_10_SECONDS);
   });
+
+  it('should keep specification group when thing model exposes the same code', () => {
+    const tuyaDevice = {
+      id: 'device-id',
+      name: 'Device',
+      model: 'Model',
+      local_override: true,
+      specifications: {
+        category: 'cz',
+        functions: [{ code: 'switch_1', name: 'Switch From Spec', type: 'Boolean' }],
+      },
+      thing_model: {
+        services: [
+          {
+            properties: [
+              {
+                code: 'switch_1',
+                name: 'Switch From Thing Model',
+                accessMode: 'ro',
+                typeSpec: { type: 'bool' },
+              },
+              {
+                code: 'cur_power',
+                name: 'Current Power',
+                accessMode: 'ro',
+                typeSpec: { min: 0, max: 99999, scale: 1, unit: 'W' },
+              },
+            ],
+          },
+        ],
+      },
+    };
+
+    const device = convertDevice.call({ serviceId: 'service-id' }, tuyaDevice);
+
+    const switchFeature = device.features.find((feature) => feature.external_id === 'tuya:device-id:switch_1');
+    const powerFeature = device.features.find((feature) => feature.external_id === 'tuya:device-id:cur_power');
+
+    expect(device.features).to.have.length(2);
+    expect(switchFeature.read_only).to.equal(false);
+    expect(switchFeature.name).to.equal('switch_1');
+    expect(powerFeature.scale).to.equal(1);
+  });
 });
diff --git a/server/test/services/tuya/lib/device/tuya.localMapping.test.js b/server/test/services/tuya/lib/device/tuya.localMapping.test.js
index f898787081..993b210ebf 100644
--- a/server/test/services/tuya/lib/device/tuya.localMapping.test.js
+++ b/server/test/services/tuya/lib/device/tuya.localMapping.test.js
@@ -22,6 +22,12 @@ describe('Tuya local mapping', () => {
     expect(result).to.equal(device);
   });
 
+  it('should return null when code is missing', () => {
+    const device = { device_type: 'smart-socket' };
+    const dpsKey = getLocalDpsFromCode(undefined, device);
+    expect(dpsKey).to.equal(null);
+  });
+
   it('should resolve aliases in strict local mapping', () => {
     const device = { device_type: 'smart-socket' };
     const dpsKey = getLocalDpsFromCode('power', device);
diff --git a/server/test/services/tuya/lib/mappings/index.test.js b/server/test/services/tuya/lib/mappings/index.test.js
index 2ad8b3a247..360259ea16 100644
--- a/server/test/services/tuya/lib/mappings/index.test.js
+++ b/server/test/services/tuya/lib/mappings/index.test.js
@@ -93,7 +93,7 @@ describe('Tuya mappings index', () => {
     const socketByThingModel = getDeviceType({
       specifications: {},
       thing_model: {
-        services: [{ properties: [{ code: 'switch_1' }] }],
+        services: [{ properties: [{}, { code: 'switch_1' }] }],
       },
       model: 'Wifi Plug Mini',
     });
@@ -102,7 +102,7 @@ describe('Tuya mappings index', () => {
     const socketByProperties = getDeviceType({
       specifications: {},
       properties: {
-        properties: [{ code: 'switch_1' }],
+        properties: [{}, { code: 'switch_1' }],
       },
       model: 'Wifi Plug Mini',
     });
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index ee3676fbeb..89d5dfeb96 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -123,6 +123,16 @@ describe('TuyaHandler.poll', () => {
 
     assert.callCount(gladys.event.emit, 0);
   });
+
+  it('should return without cloud request when feature list is empty', async () => {
+    await tuyaHandler.poll({
+      external_id: 'tuya:device',
+      features: [],
+    });
+
+    assert.callCount(tuyaHandler.connector.request, 0);
+    assert.callCount(gladys.event.emit, 0);
+  });
 });
 
 describe('TuyaHandler.poll with local mapping', () => {

From 3b22df14596a9c87f55a673a82f107d09a13fa57 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 28 Feb 2026 13:54:06 +0100
Subject: [PATCH 54/90] feat(tuya): add smart meter support and fixture-based
 tests

---
 .../tuya/lib/device/tuya.deviceMapping.js     |  19 +++
 .../tuya/lib/mappings/cloud/smart-meter.js    |  89 +++++++++++++
 server/services/tuya/lib/mappings/index.js    |  16 ++-
 .../tuya/lib/mappings/local/smart-meter.js    |  19 +++
 .../cloud-status.json                         |  10 ++
 .../expected-cloud-events.json                |  26 ++++
 .../expected-device.json                      | 101 +++++++++++++++
 .../expected-local-events.json                |  26 ++++
 .../expected-local-mapping.json               |   8 ++
 .../input-device.json                         | 100 +++++++++++++++
 .../local-dps.json                            |   8 ++
 .../smart-meter-bbcg1hrkrj5rifsd/manifest.js  |  22 ++++
 .../poll-device.json                          |  60 +++++++++
 .../smart-socket-basic/cloud-status.json      |   6 +
 .../expected-cloud-events.json                |  10 ++
 .../smart-socket-basic/expected-device.json   |  52 ++++++++
 .../expected-local-events.json                |   6 +
 .../expected-local-mapping.json               |   4 +
 .../smart-socket-basic/input-device.json      |  42 +++++++
 .../devices/smart-socket-basic/local-dps.json |   4 +
 .../devices/smart-socket-basic/manifest.js    |  32 +++++
 .../smart-socket-basic/poll-device.json       |  27 ++++
 .../services/tuya/fixtures/fixtureHelper.js   | 118 ++++++++++++++++++
 .../device/feature/tuya.deviceMapping.test.js |  43 +++++++
 .../tuya.convertDevice.fixtures.test.js       |  21 ++++
 .../device/tuya.localMapping.fixtures.test.js |  24 ++++
 .../tuya/lib/device/tuya.localMapping.test.js |   6 +
 .../services/tuya/lib/mappings/index.test.js  |  23 ++++
 .../tuya/lib/tuya.poll.fixtures.test.js       |  77 ++++++++++++
 .../test/services/tuya/lib/tuya.poll.test.js  |  26 ----
 .../tuya/lib/tuya.setValue.fixtures.test.js   |  48 +++++++
 .../services/tuya/lib/tuya.setValue.test.js   |   7 +-
 32 files changed, 1052 insertions(+), 28 deletions(-)
 create mode 100644 server/services/tuya/lib/mappings/cloud/smart-meter.js
 create mode 100644 server/services/tuya/lib/mappings/local/smart-meter.js
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/cloud-status.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-cloud-events.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-events.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-mapping.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/input-device.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/local-dps.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/manifest.js
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-basic/cloud-status.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-cloud-events.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-local-events.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-local-mapping.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-basic/input-device.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-basic/local-dps.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-basic/manifest.js
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-basic/poll-device.json
 create mode 100644 server/test/services/tuya/fixtures/fixtureHelper.js
 create mode 100644 server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js
 create mode 100644 server/test/services/tuya/lib/device/tuya.localMapping.fixtures.test.js
 create mode 100644 server/test/services/tuya/lib/tuya.poll.fixtures.test.js
 create mode 100644 server/test/services/tuya/lib/tuya.setValue.fixtures.test.js

diff --git a/server/services/tuya/lib/device/tuya.deviceMapping.js b/server/services/tuya/lib/device/tuya.deviceMapping.js
index a608732b2f..7f9bade2ed 100644
--- a/server/services/tuya/lib/device/tuya.deviceMapping.js
+++ b/server/services/tuya/lib/device/tuya.deviceMapping.js
@@ -105,6 +105,25 @@ const readValues = {
       return scaleValue(valueFromDevice, deviceFeature, 1);
     },
   },
+  [DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR]: {
+    [DEVICE_FEATURE_TYPES.ENERGY_SENSOR.POWER]: (valueFromDevice, deviceFeature) => {
+      return scaleValue(valueFromDevice, deviceFeature, 0);
+    },
+    [DEVICE_FEATURE_TYPES.ENERGY_SENSOR.ENERGY]: (valueFromDevice, deviceFeature) => {
+      return scaleValue(valueFromDevice, deviceFeature, 0);
+    },
+    [DEVICE_FEATURE_TYPES.ENERGY_SENSOR.VOLTAGE]: (valueFromDevice, deviceFeature) => {
+      return scaleValue(valueFromDevice, deviceFeature, 0);
+    },
+    [DEVICE_FEATURE_TYPES.ENERGY_SENSOR.CURRENT]: (valueFromDevice, deviceFeature) => {
+      return scaleValue(valueFromDevice, deviceFeature, 0);
+    },
+  },
+  [DEVICE_FEATURE_CATEGORIES.ENERGY_PRODUCTION_SENSOR]: {
+    [DEVICE_FEATURE_TYPES.ENERGY_PRODUCTION_SENSOR.INDEX]: (valueFromDevice, deviceFeature) => {
+      return scaleValue(valueFromDevice, deviceFeature, 0);
+    },
+  },
   [DEVICE_FEATURE_CATEGORIES.CURTAIN]: {
     [DEVICE_FEATURE_TYPES.CURTAIN.STATE]: (valueFromDevice) => {
       if (valueFromDevice === OPEN) {
diff --git a/server/services/tuya/lib/mappings/cloud/smart-meter.js b/server/services/tuya/lib/mappings/cloud/smart-meter.js
new file mode 100644
index 0000000000..164a512bd8
--- /dev/null
+++ b/server/services/tuya/lib/mappings/cloud/smart-meter.js
@@ -0,0 +1,89 @@
+const {
+  DEVICE_FEATURE_TYPES,
+  DEVICE_FEATURE_CATEGORIES,
+  DEVICE_FEATURE_UNITS,
+} = require('../../../../../utils/constants');
+
+module.exports = {
+  ignoredCodes: [
+    'coef_a_reset',
+    'coef_b_reset',
+    'current_a_calibration',
+    'current_b_calibration',
+    'direction_a',
+    'direction_b',
+    'energy_a_calibration_fwd',
+    'energy_a_calibration_rev',
+    'energy_b_calibration_fwd',
+    'energy_b_calibration_rev',
+    'freq',
+    'freq_calibration',
+    'power_a_calibration',
+    'power_b_calibration',
+    'power_factor',
+    'power_factor_b',
+    'report_rate_control',
+    'tbd',
+    'voltage_coef',
+  ],
+  power_a: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.POWER,
+    unit: DEVICE_FEATURE_UNITS.WATT,
+  },
+  power_b: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.POWER,
+    unit: DEVICE_FEATURE_UNITS.WATT,
+  },
+  total_power: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.POWER,
+    unit: DEVICE_FEATURE_UNITS.WATT,
+  },
+  voltage_a: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.VOLTAGE,
+    unit: DEVICE_FEATURE_UNITS.VOLT,
+  },
+  current_a: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.CURRENT,
+    unit: DEVICE_FEATURE_UNITS.MILLI_AMPERE,
+  },
+  current_b: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.CURRENT,
+    unit: DEVICE_FEATURE_UNITS.MILLI_AMPERE,
+  },
+  energy_forword_a: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.ENERGY,
+    unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
+  },
+  energy_forword_b: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.ENERGY,
+    unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
+  },
+  forward_energy_total: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.ENERGY,
+    unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
+  },
+  energy_reverse_a: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_PRODUCTION_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_PRODUCTION_SENSOR.INDEX,
+    unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
+  },
+  energy_reserse_b: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_PRODUCTION_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_PRODUCTION_SENSOR.INDEX,
+    unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
+  },
+  reverse_energy_total: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_PRODUCTION_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_PRODUCTION_SENSOR.INDEX,
+    unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
+  },
+};
diff --git a/server/services/tuya/lib/mappings/index.js b/server/services/tuya/lib/mappings/index.js
index 90f603389e..5cc2b3740c 100644
--- a/server/services/tuya/lib/mappings/index.js
+++ b/server/services/tuya/lib/mappings/index.js
@@ -1,15 +1,19 @@
 const globalCloud = require('./cloud/global');
+const smartMeterCloud = require('./cloud/smart-meter');
 const smartSocketCloud = require('./cloud/smart-socket');
 
 const globalLocal = require('./local/global');
+const smartMeterLocal = require('./local/smart-meter');
 const smartSocketLocal = require('./local/smart-socket');
 
 const DEVICE_TYPES = {
+  SMART_METER: 'smart-meter',
   SMART_SOCKET: 'smart-socket',
   UNKNOWN: 'unknown',
 };
 
 const SWITCH_CODES = new Set(['switch', 'switch_1', 'switch_2', 'power']);
+const SMART_METER_CODES = new Set(['total_power', 'forward_energy_total', 'voltage_a', 'current_a']);
 
 const SMART_SOCKET = {
   DEVICE_TYPE_NAME: DEVICE_TYPES.SMART_SOCKET,
@@ -21,7 +25,17 @@ const SMART_SOCKET = {
   LOCAL_MAPPINGS: smartSocketLocal,
 };
 
-const LIST_DEVICE_TYPES = [SMART_SOCKET];
+const SMART_METER = {
+  DEVICE_TYPE_NAME: DEVICE_TYPES.SMART_METER,
+  CATEGORIES: new Set(),
+  PRODUCT_IDS: new Set(['bbcg1hrkrj5rifsd']),
+  KEYWORDS: ['smart meter', 'meter'],
+  REQUIRED_CODES: SMART_METER_CODES,
+  CLOUD_MAPPINGS: smartMeterCloud,
+  LOCAL_MAPPINGS: smartMeterLocal,
+};
+
+const LIST_DEVICE_TYPES = [SMART_SOCKET, SMART_METER];
 
 const normalizeCode = (code) => {
   if (!code) {
diff --git a/server/services/tuya/lib/mappings/local/smart-meter.js b/server/services/tuya/lib/mappings/local/smart-meter.js
new file mode 100644
index 0000000000..5eabaeacca
--- /dev/null
+++ b/server/services/tuya/lib/mappings/local/smart-meter.js
@@ -0,0 +1,19 @@
+module.exports = {
+  strict: true,
+  ignoredDps: ['102', '103', '104', '110', '116', '117', '118', '119', '120', '121', '122', '123', '124', '125', '126', '127', '128', '129'],
+  codeAliases: {},
+  dps: {
+    power_a: 101,
+    power_b: 105,
+    energy_forword_a: 106,
+    energy_reverse_a: 107,
+    energy_forword_b: 108,
+    energy_reserse_b: 109,
+    voltage_a: 112,
+    current_a: 113,
+    current_b: 114,
+    total_power: 115,
+    forward_energy_total: 130,
+    reverse_energy_total: 131,
+  },
+};
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/cloud-status.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/cloud-status.json
new file mode 100644
index 0000000000..518e38760c
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/cloud-status.json
@@ -0,0 +1,10 @@
+{
+  "result": [
+    { "code": "total_power", "value": 706 },
+    { "code": "forward_energy_total", "value": 149241 },
+    { "code": "voltage_a", "value": 2301 },
+    { "code": "current_a", "value": 123 },
+    { "code": "current_b", "value": 456 },
+    { "code": "reverse_energy_total", "value": 43222 }
+  ]
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-cloud-events.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-cloud-events.json
new file mode 100644
index 0000000000..00f85006e6
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-cloud-events.json
@@ -0,0 +1,26 @@
+[
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:total_power",
+    "state": 70.6
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:forward_energy_total",
+    "state": 1492.41
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:voltage_a",
+    "state": 230.1
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:current_a",
+    "state": 123
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:current_b",
+    "state": 456
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:reverse_energy_total",
+    "state": 432.22
+  }
+]
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
new file mode 100644
index 0000000000..1e74dd2381
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
@@ -0,0 +1,101 @@
+{
+  "name": "Production solaire",
+  "external_id": "tuya:smart-meter-device-id",
+  "selector": "tuya:smart-meter-device-id",
+  "device_type": "smart-meter",
+  "model": "Smart Meter",
+  "product_id": "bbcg1hrkrj5rifsd",
+  "online": true,
+  "poll_frequency": 10000,
+  "should_poll": true,
+  "params": {
+    "DEVICE_ID": "smart-meter-device-id",
+    "LOCAL_OVERRIDE": true,
+    "PROTOCOL_VERSION": "3.3",
+    "PRODUCT_ID": "bbcg1hrkrj5rifsd"
+  },
+  "tuya_mapping": {
+    "ignored_local_dps": ["102", "103", "104", "110", "116", "117", "118", "119", "120", "121", "122", "123", "124", "125", "126", "127", "128", "129"],
+    "ignored_cloud_codes": ["coef_a_reset", "coef_b_reset", "current_a_calibration", "current_b_calibration", "direction_a", "direction_b", "energy_a_calibration_fwd", "energy_a_calibration_rev", "energy_b_calibration_fwd", "energy_b_calibration_rev", "freq", "freq_calibration", "power_a_calibration", "power_b_calibration", "power_factor", "power_factor_b", "report_rate_control", "tbd", "voltage_coef"]
+  },
+  "features": [
+    {
+      "name": "total_power",
+      "external_id": "tuya:smart-meter-device-id:total_power",
+      "selector": "tuya:smart-meter-device-id:total_power",
+      "category": "energy-sensor",
+      "type": "power",
+      "read_only": true,
+      "has_feedback": false,
+      "min": -99999999,
+      "max": 99999999,
+      "unit": "watt",
+      "scale": 1
+    },
+    {
+      "name": "forward_energy_total",
+      "external_id": "tuya:smart-meter-device-id:forward_energy_total",
+      "selector": "tuya:smart-meter-device-id:forward_energy_total",
+      "category": "energy-sensor",
+      "type": "energy",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 99999999,
+      "unit": "kilowatt-hour",
+      "scale": 2
+    },
+    {
+      "name": "voltage_a",
+      "external_id": "tuya:smart-meter-device-id:voltage_a",
+      "selector": "tuya:smart-meter-device-id:voltage_a",
+      "category": "energy-sensor",
+      "type": "voltage",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 99999999,
+      "unit": "volt",
+      "scale": 1
+    },
+    {
+      "name": "current_a",
+      "external_id": "tuya:smart-meter-device-id:current_a",
+      "selector": "tuya:smart-meter-device-id:current_a",
+      "category": "energy-sensor",
+      "type": "current",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 99999999,
+      "unit": "milliampere",
+      "scale": 0
+    },
+    {
+      "name": "current_b",
+      "external_id": "tuya:smart-meter-device-id:current_b",
+      "selector": "tuya:smart-meter-device-id:current_b",
+      "category": "energy-sensor",
+      "type": "current",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 99999999,
+      "unit": "milliampere",
+      "scale": 0
+    },
+    {
+      "name": "reverse_energy_total",
+      "external_id": "tuya:smart-meter-device-id:reverse_energy_total",
+      "selector": "tuya:smart-meter-device-id:reverse_energy_total",
+      "category": "energy-production-sensor",
+      "type": "index",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 99999999,
+      "unit": "kilowatt-hour",
+      "scale": 2
+    }
+  ]
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-events.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-events.json
new file mode 100644
index 0000000000..00f85006e6
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-events.json
@@ -0,0 +1,26 @@
+[
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:total_power",
+    "state": 70.6
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:forward_energy_total",
+    "state": 1492.41
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:voltage_a",
+    "state": 230.1
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:current_a",
+    "state": 123
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:current_b",
+    "state": 456
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:reverse_energy_total",
+    "state": 432.22
+  }
+]
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-mapping.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-mapping.json
new file mode 100644
index 0000000000..ed48876631
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-mapping.json
@@ -0,0 +1,8 @@
+{
+  "total_power": 115,
+  "forward_energy_total": 130,
+  "voltage_a": 112,
+  "current_a": 113,
+  "current_b": 114,
+  "reverse_energy_total": 131
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/input-device.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/input-device.json
new file mode 100644
index 0000000000..a80d8a55d5
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/input-device.json
@@ -0,0 +1,100 @@
+{
+  "id": "smart-meter-device-id",
+  "name": "Production solaire",
+  "model": "Smart Meter",
+  "product_id": "bbcg1hrkrj5rifsd",
+  "protocol_version": "3.3",
+  "local_override": true,
+  "online": true,
+  "specifications": {},
+  "properties": {
+    "properties": [
+      {
+        "code": "total_power",
+        "dp_id": 115,
+        "type": "value",
+        "value": 706
+      }
+    ]
+  },
+  "thing_model": {
+    "services": [
+      {
+        "properties": [
+          {
+            "code": "total_power",
+            "name": "Total_Power",
+            "accessMode": "ro",
+            "typeSpec": {
+              "type": "value",
+              "min": -99999999,
+              "max": 99999999,
+              "scale": 1,
+              "unit": "W"
+            }
+          },
+          {
+            "code": "forward_energy_total",
+            "name": "Forward Energy Total",
+            "accessMode": "ro",
+            "typeSpec": {
+              "type": "value",
+              "min": 0,
+              "max": 99999999,
+              "scale": 2,
+              "unit": "KWH"
+            }
+          },
+          {
+            "code": "reverse_energy_total",
+            "name": "Reverse Energy Total",
+            "accessMode": "ro",
+            "typeSpec": {
+              "type": "value",
+              "min": 0,
+              "max": 99999999,
+              "scale": 2,
+              "unit": "KWH"
+            }
+          },
+          {
+            "code": "voltage_a",
+            "name": "Voltage A",
+            "accessMode": "ro",
+            "typeSpec": {
+              "type": "value",
+              "min": 0,
+              "max": 99999999,
+              "scale": 1,
+              "unit": "V"
+            }
+          },
+          {
+            "code": "current_a",
+            "name": "Current A",
+            "accessMode": "ro",
+            "typeSpec": {
+              "type": "value",
+              "min": 0,
+              "max": 99999999,
+              "scale": 0,
+              "unit": "mA"
+            }
+          },
+          {
+            "code": "current_b",
+            "name": "Current B",
+            "accessMode": "ro",
+            "typeSpec": {
+              "type": "value",
+              "min": 0,
+              "max": 99999999,
+              "scale": 0,
+              "unit": "mA"
+            }
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/local-dps.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/local-dps.json
new file mode 100644
index 0000000000..9d65a13b98
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/local-dps.json
@@ -0,0 +1,8 @@
+{
+  "115": 706,
+  "130": 149241,
+  "112": 2301,
+  "113": 123,
+  "114": 456,
+  "131": 43222
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/manifest.js b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/manifest.js
new file mode 100644
index 0000000000..6d8d8d5f65
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/manifest.js
@@ -0,0 +1,22 @@
+module.exports = {
+  name: 'smart meter bbcg1hrkrj5rifsd',
+  convertDevice: {
+    input: './input-device.json',
+    expected: './expected-device.json',
+  },
+  pollCloud: {
+    device: './poll-device.json',
+    response: './cloud-status.json',
+    expectedEvents: './expected-cloud-events.json',
+  },
+  pollLocal: {
+    device: './poll-device.json',
+    dps: './local-dps.json',
+    expectedEvents: './expected-local-events.json',
+    expectedCloudRequests: 0,
+  },
+  localMapping: {
+    device: './poll-device.json',
+    expected: './expected-local-mapping.json',
+  },
+};
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json
new file mode 100644
index 0000000000..546a7f9472
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json
@@ -0,0 +1,60 @@
+{
+  "external_id": "tuya:smart-meter-device-id",
+  "device_type": "smart-meter",
+  "params": [
+    { "name": "IP_ADDRESS", "value": "10.0.0.20" },
+    { "name": "LOCAL_KEY", "value": "local-key" },
+    { "name": "PROTOCOL_VERSION", "value": "3.3" },
+    { "name": "LOCAL_OVERRIDE", "value": true }
+  ],
+  "features": [
+    {
+      "external_id": "tuya:smart-meter-device-id:total_power",
+      "selector": "tuya:smart-meter-device-id:total_power",
+      "category": "energy-sensor",
+      "type": "power",
+      "scale": 1,
+      "last_value": 0
+    },
+    {
+      "external_id": "tuya:smart-meter-device-id:forward_energy_total",
+      "selector": "tuya:smart-meter-device-id:forward_energy_total",
+      "category": "energy-sensor",
+      "type": "energy",
+      "scale": 2,
+      "last_value": 0
+    },
+    {
+      "external_id": "tuya:smart-meter-device-id:voltage_a",
+      "selector": "tuya:smart-meter-device-id:voltage_a",
+      "category": "energy-sensor",
+      "type": "voltage",
+      "scale": 1,
+      "last_value": 0
+    },
+    {
+      "external_id": "tuya:smart-meter-device-id:current_a",
+      "selector": "tuya:smart-meter-device-id:current_a",
+      "category": "energy-sensor",
+      "type": "current",
+      "scale": 0,
+      "last_value": 0
+    },
+    {
+      "external_id": "tuya:smart-meter-device-id:current_b",
+      "selector": "tuya:smart-meter-device-id:current_b",
+      "category": "energy-sensor",
+      "type": "current",
+      "scale": 0,
+      "last_value": 0
+    },
+    {
+      "external_id": "tuya:smart-meter-device-id:reverse_energy_total",
+      "selector": "tuya:smart-meter-device-id:reverse_energy_total",
+      "category": "energy-production-sensor",
+      "type": "index",
+      "scale": 2,
+      "last_value": 0
+    }
+  ]
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/cloud-status.json b/server/test/services/tuya/fixtures/devices/smart-socket-basic/cloud-status.json
new file mode 100644
index 0000000000..4a7806299b
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/cloud-status.json
@@ -0,0 +1,6 @@
+{
+  "result": [
+    { "code": "switch_1", "value": true },
+    { "code": "cur_power", "value": 2245 }
+  ]
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-cloud-events.json b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-cloud-events.json
new file mode 100644
index 0000000000..0cdff16742
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-cloud-events.json
@@ -0,0 +1,10 @@
+[
+  {
+    "device_feature_external_id": "tuya:socket-device-id:switch_1",
+    "state": 1
+  },
+  {
+    "device_feature_external_id": "tuya:socket-device-id:cur_power",
+    "state": 224.5
+  }
+]
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json
new file mode 100644
index 0000000000..8d775e83e4
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json
@@ -0,0 +1,52 @@
+{
+  "name": "Kitchen Plug",
+  "external_id": "tuya:socket-device-id",
+  "selector": "tuya:socket-device-id",
+  "device_type": "smart-socket",
+  "model": "Mini Plug",
+  "product_id": "cya3zxfd38g4qp8d",
+  "product_key": "socket-key",
+  "online": true,
+  "poll_frequency": 10000,
+  "should_poll": true,
+  "params": {
+    "DEVICE_ID": "socket-device-id",
+    "LOCAL_KEY": "local-key",
+    "IP_ADDRESS": "10.0.0.10",
+    "CLOUD_IP": "1.2.3.4",
+    "LOCAL_OVERRIDE": true,
+    "PROTOCOL_VERSION": "3.3",
+    "PRODUCT_ID": "cya3zxfd38g4qp8d",
+    "PRODUCT_KEY": "socket-key"
+  },
+  "tuya_mapping": {
+    "ignored_local_dps": ["11"],
+    "ignored_cloud_codes": ["countdown", "countdown_1"]
+  },
+  "features": [
+    {
+      "name": "switch_1",
+      "external_id": "tuya:socket-device-id:switch_1",
+      "selector": "tuya:socket-device-id:switch_1",
+      "category": "switch",
+      "type": "binary",
+      "read_only": false,
+      "has_feedback": false,
+      "min": 0,
+      "max": 1
+    },
+    {
+      "name": "cur_power",
+      "external_id": "tuya:socket-device-id:cur_power",
+      "selector": "tuya:socket-device-id:cur_power",
+      "category": "switch",
+      "type": "power",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 99999,
+      "unit": "watt",
+      "scale": 1
+    }
+  ]
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-local-events.json b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-local-events.json
new file mode 100644
index 0000000000..d619525b70
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-local-events.json
@@ -0,0 +1,6 @@
+[
+  {
+    "device_feature_external_id": "tuya:socket-device-id:switch_1",
+    "state": 1
+  }
+]
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-local-mapping.json b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-local-mapping.json
new file mode 100644
index 0000000000..468886a9a1
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-local-mapping.json
@@ -0,0 +1,4 @@
+{
+  "switch_1": 1,
+  "cur_power": null
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/input-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-basic/input-device.json
new file mode 100644
index 0000000000..971729493a
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/input-device.json
@@ -0,0 +1,42 @@
+{
+  "id": "socket-device-id",
+  "name": "Kitchen Plug",
+  "product_name": "Mini Plug",
+  "product_id": "cya3zxfd38g4qp8d",
+  "product_key": "socket-key",
+  "local_key": "local-key",
+  "ip": "10.0.0.10",
+  "cloud_ip": "1.2.3.4",
+  "protocol_version": "3.3",
+  "local_override": true,
+  "online": true,
+  "specifications": {
+    "category": "cz",
+    "functions": [
+      {
+        "code": "switch_1",
+        "name": "Switch 1",
+        "type": "Boolean"
+      }
+    ],
+    "status": [
+      {
+        "code": "cur_power",
+        "name": "Current Power",
+        "type": "Integer",
+        "values": {
+          "min": 0,
+          "max": 99999,
+          "scale": 1,
+          "unit": "W"
+        }
+      }
+    ]
+  },
+  "properties": {
+    "properties": []
+  },
+  "thing_model": {
+    "services": []
+  }
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/local-dps.json b/server/test/services/tuya/fixtures/devices/smart-socket-basic/local-dps.json
new file mode 100644
index 0000000000..faa5caa487
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/local-dps.json
@@ -0,0 +1,4 @@
+{
+  "1": true,
+  "6": 2245
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/manifest.js b/server/test/services/tuya/fixtures/devices/smart-socket-basic/manifest.js
new file mode 100644
index 0000000000..972c44cfc0
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/manifest.js
@@ -0,0 +1,32 @@
+module.exports = {
+  name: 'smart socket basic',
+  convertDevice: {
+    input: './input-device.json',
+    expected: './expected-device.json',
+  },
+  pollCloud: {
+    device: './poll-device.json',
+    response: './cloud-status.json',
+    expectedEvents: './expected-cloud-events.json',
+  },
+  pollLocal: {
+    device: './poll-device.json',
+    dps: './local-dps.json',
+    expectedEvents: './expected-local-events.json',
+    expectedCloudRequests: 1,
+  },
+  localMapping: {
+    device: './poll-device.json',
+    expected: './expected-local-mapping.json',
+  },
+  setValueLocal: {
+    device: './poll-device.json',
+    featureExternalId: 'tuya:socket-device-id:switch_1',
+    inputValue: 1,
+    expectedLocalSet: {
+      dps: 1,
+      set: true,
+    },
+    expectedCloudRequests: 0,
+  },
+};
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/poll-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-basic/poll-device.json
new file mode 100644
index 0000000000..2914f5663f
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/poll-device.json
@@ -0,0 +1,27 @@
+{
+  "external_id": "tuya:socket-device-id",
+  "device_type": "smart-socket",
+  "params": [
+    { "name": "IP_ADDRESS", "value": "10.0.0.10" },
+    { "name": "LOCAL_KEY", "value": "local-key" },
+    { "name": "PROTOCOL_VERSION", "value": "3.3" },
+    { "name": "LOCAL_OVERRIDE", "value": true }
+  ],
+  "features": [
+    {
+      "external_id": "tuya:socket-device-id:switch_1",
+      "selector": "tuya:socket-device-id:switch_1",
+      "category": "switch",
+      "type": "binary",
+      "last_value": 0
+    },
+    {
+      "external_id": "tuya:socket-device-id:cur_power",
+      "selector": "tuya:socket-device-id:cur_power",
+      "category": "switch",
+      "type": "power",
+      "scale": 1,
+      "last_value": 0
+    }
+  ]
+}
diff --git a/server/test/services/tuya/fixtures/fixtureHelper.js b/server/test/services/tuya/fixtures/fixtureHelper.js
new file mode 100644
index 0000000000..ea10c7d9d0
--- /dev/null
+++ b/server/test/services/tuya/fixtures/fixtureHelper.js
@@ -0,0 +1,118 @@
+const fs = require('fs');
+const path = require('path');
+
+const FIXTURES_ROOT = path.join(__dirname, 'devices');
+
+const sortByKey = (value) => {
+  if (Array.isArray(value)) {
+    return value.map(sortByKey).sort((left, right) => {
+      const leftKey = JSON.stringify(left);
+      const rightKey = JSON.stringify(right);
+      return leftKey.localeCompare(rightKey);
+    });
+  }
+  if (value && typeof value === 'object') {
+    return Object.keys(value)
+      .sort()
+      .reduce((accumulator, key) => {
+        accumulator[key] = sortByKey(value[key]);
+        return accumulator;
+      }, {});
+  }
+  return value;
+};
+
+const loadJson = (filename) => JSON.parse(fs.readFileSync(filename, 'utf8'));
+
+const omitUndefined = (value) =>
+  Object.keys(value).reduce((accumulator, key) => {
+    if (value[key] !== undefined) {
+      accumulator[key] = value[key];
+    }
+    return accumulator;
+  }, {});
+
+const normalizeParams = (params) =>
+  (Array.isArray(params) ? params : []).reduce((accumulator, param) => {
+    accumulator[param.name] = param.value;
+    return accumulator;
+  }, {});
+
+const normalizeFeatures = (features) =>
+  sortByKey(
+    (Array.isArray(features) ? features : []).map((feature) => {
+      const normalized = omitUndefined({
+        name: feature.name,
+        external_id: feature.external_id,
+        selector: feature.selector,
+        category: feature.category,
+        type: feature.type,
+        read_only: feature.read_only,
+        has_feedback: feature.has_feedback,
+        min: feature.min,
+        max: feature.max,
+      });
+
+      if (feature.unit !== undefined) {
+        normalized.unit = feature.unit;
+      }
+      if (feature.scale !== undefined) {
+        normalized.scale = feature.scale;
+      }
+      return normalized;
+    }),
+  );
+
+const normalizeConvertedDevice = (device) =>
+  omitUndefined({
+  name: device.name,
+  external_id: device.external_id,
+  selector: device.selector,
+  device_type: device.device_type,
+  model: device.model,
+  product_id: device.product_id,
+  product_key: device.product_key,
+  online: device.online,
+  poll_frequency: device.poll_frequency,
+  should_poll: device.should_poll,
+  params: normalizeParams(device.params),
+  tuya_mapping: sortByKey(device.tuya_mapping),
+  features: normalizeFeatures(device.features),
+  });
+
+const normalizeEvents = (calls) =>
+  sortByKey(
+    calls.map((call) => ({
+      device_feature_external_id: call.args[1].device_feature_external_id,
+      state: call.args[1].state,
+    })),
+  );
+
+const loadFixtureCases = (sectionName) =>
+  fs
+    .readdirSync(FIXTURES_ROOT)
+    .sort()
+    .map((directoryName) => {
+      const fixtureDirectory = path.join(FIXTURES_ROOT, directoryName);
+      const manifest = require(path.join(fixtureDirectory, 'manifest.js'));
+      if (!manifest[sectionName]) {
+        return null;
+      }
+      return {
+        directoryName,
+        fixtureDirectory,
+        manifest,
+        load(relativePath) {
+          return loadJson(path.join(fixtureDirectory, relativePath));
+        },
+      };
+    })
+    .filter(Boolean);
+
+module.exports = {
+  loadFixtureCases,
+  normalizeConvertedDevice,
+  normalizeEvents,
+  omitUndefined,
+  sortByKey,
+};
diff --git a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
index 246ad9417a..5637d6735b 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
@@ -137,6 +137,49 @@ describe('Tuya device mapping', () => {
         expect(Number.isNaN(result)).to.equal(true);
       });
     });
+    describe('energy sensor', () => {
+      it('switch power invalid value returns NaN', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.POWER](
+          'not-a-number',
+        );
+        expect(Number.isNaN(result)).to.equal(true);
+      });
+      it('power with scale', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][DEVICE_FEATURE_TYPES.ENERGY_SENSOR.POWER](
+          '706',
+          { scale: 1 },
+        );
+        expect(result).to.eq(70.6);
+      });
+      it('energy with scale', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][DEVICE_FEATURE_TYPES.ENERGY_SENSOR.ENERGY](
+          '149241',
+          { scale: 2 },
+        );
+        expect(result).to.eq(1492.41);
+      });
+      it('voltage with scale', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][DEVICE_FEATURE_TYPES.ENERGY_SENSOR.VOLTAGE](
+          '2301',
+          { scale: 1 },
+        );
+        expect(result).to.eq(230.1);
+      });
+      it('current without scale', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][DEVICE_FEATURE_TYPES.ENERGY_SENSOR.CURRENT](
+          '123',
+          { scale: 0 },
+        );
+        expect(result).to.eq(123);
+      });
+      it('production index with scale', () => {
+        const result =
+          readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_PRODUCTION_SENSOR][
+            DEVICE_FEATURE_TYPES.ENERGY_PRODUCTION_SENSOR.INDEX
+          ]('43222', { scale: 2 });
+        expect(result).to.eq(432.22);
+      });
+    });
     describe('curtain state', () => {
       it('open', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.CURTAIN][DEVICE_FEATURE_TYPES.CURTAIN.STATE]('open');
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js
new file mode 100644
index 0000000000..314c65549d
--- /dev/null
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js
@@ -0,0 +1,21 @@
+const { expect } = require('chai');
+
+const { convertDevice } = require('../../../../../services/tuya/lib/device/tuya.convertDevice');
+const {
+  loadFixtureCases,
+  normalizeConvertedDevice,
+  sortByKey,
+} = require('../../fixtures/fixtureHelper');
+
+describe('tuya.convertDevice fixtures', () => {
+  const fixtureCases = loadFixtureCases('convertDevice');
+
+  fixtureCases.forEach((fixtureCase) => {
+    it(`should convert ${fixtureCase.manifest.name} from fixture`, () => {
+      const { input, expected } = fixtureCase.manifest.convertDevice;
+      const device = convertDevice.call({ serviceId: 'service-id' }, fixtureCase.load(input));
+
+      expect(normalizeConvertedDevice(device)).to.deep.equal(sortByKey(fixtureCase.load(expected)));
+    });
+  });
+});
diff --git a/server/test/services/tuya/lib/device/tuya.localMapping.fixtures.test.js b/server/test/services/tuya/lib/device/tuya.localMapping.fixtures.test.js
new file mode 100644
index 0000000000..5e32222204
--- /dev/null
+++ b/server/test/services/tuya/lib/device/tuya.localMapping.fixtures.test.js
@@ -0,0 +1,24 @@
+const { expect } = require('chai');
+
+const { getLocalDpsFromCode } = require('../../../../../services/tuya/lib/device/tuya.localMapping');
+const { loadFixtureCases, sortByKey } = require('../../fixtures/fixtureHelper');
+
+describe('Tuya local mapping fixtures', () => {
+  const fixtureCases = loadFixtureCases('localMapping');
+
+  fixtureCases.forEach((fixtureCase) => {
+    it(`should resolve local dps for ${fixtureCase.manifest.name} from fixture`, () => {
+      const { device, expected } = fixtureCase.manifest.localMapping;
+      const currentDevice = fixtureCase.load(device);
+      const expectedMapping = fixtureCase.load(expected);
+
+      const resolvedMapping = currentDevice.features.reduce((accumulator, feature) => {
+        const code = String(feature.external_id).split(':').pop();
+        accumulator[code] = getLocalDpsFromCode(code, currentDevice);
+        return accumulator;
+      }, {});
+
+      expect(sortByKey(resolvedMapping)).to.deep.equal(sortByKey(expectedMapping));
+    });
+  });
+});
diff --git a/server/test/services/tuya/lib/device/tuya.localMapping.test.js b/server/test/services/tuya/lib/device/tuya.localMapping.test.js
index 993b210ebf..01d884080a 100644
--- a/server/test/services/tuya/lib/device/tuya.localMapping.test.js
+++ b/server/test/services/tuya/lib/device/tuya.localMapping.test.js
@@ -95,4 +95,10 @@ describe('Tuya local mapping', () => {
     expect(result.features).to.have.length(1);
     expect(result.features[0].external_id).to.equal('tuya:device:switch_1');
   });
+
+  it('should resolve total_power in smart meter local mapping', () => {
+    const device = { device_type: 'smart-meter' };
+    const dpsKey = getLocalDpsFromCode('total_power', device);
+    expect(dpsKey).to.equal(115);
+  });
 });
diff --git a/server/test/services/tuya/lib/mappings/index.test.js b/server/test/services/tuya/lib/mappings/index.test.js
index 360259ea16..1a4a0d7cf9 100644
--- a/server/test/services/tuya/lib/mappings/index.test.js
+++ b/server/test/services/tuya/lib/mappings/index.test.js
@@ -63,6 +63,14 @@ describe('Tuya mappings index', () => {
     const unsupportedLocal = getLocalMapping('unsupported-device');
     expect(unsupportedLocal.strict).to.equal(false);
     expect(unsupportedLocal.ignoredDps).to.not.include('11');
+
+    const smartMeterCloud = getCloudMapping(DEVICE_TYPES.SMART_METER);
+    expect(smartMeterCloud.total_power).to.be.an('object');
+    expect(smartMeterCloud.forward_energy_total).to.be.an('object');
+
+    const smartMeterLocal = getLocalMapping(DEVICE_TYPES.SMART_METER);
+    expect(smartMeterLocal.strict).to.equal(true);
+    expect(smartMeterLocal.dps.total_power).to.equal(115);
   });
 
   it('should detect device types', () => {
@@ -107,6 +115,21 @@ describe('Tuya mappings index', () => {
       model: 'Wifi Plug Mini',
     });
     expect(socketByProperties).to.equal(DEVICE_TYPES.SMART_SOCKET);
+
+    const smartMeterByProductId = getDeviceType({
+      specifications: {},
+      product_id: 'bbcg1hrkrj5rifsd',
+    });
+    expect(smartMeterByProductId).to.equal(DEVICE_TYPES.SMART_METER);
+
+    const smartMeterByThingModel = getDeviceType({
+      specifications: {},
+      thing_model: {
+        services: [{ properties: [{ code: 'total_power' }, { code: 'forward_energy_total' }] }],
+      },
+      model: 'DIN Smart Meter',
+    });
+    expect(smartMeterByThingModel).to.equal(DEVICE_TYPES.SMART_METER);
   });
 
   it('should get feature mapping and ignore invalid candidates', () => {
diff --git a/server/test/services/tuya/lib/tuya.poll.fixtures.test.js b/server/test/services/tuya/lib/tuya.poll.fixtures.test.js
new file mode 100644
index 0000000000..800db3c542
--- /dev/null
+++ b/server/test/services/tuya/lib/tuya.poll.fixtures.test.js
@@ -0,0 +1,77 @@
+const sinon = require('sinon');
+const { expect } = require('chai');
+const proxyquire = require('proxyquire').noCallThru();
+
+const { EVENTS } = require('../../../../utils/constants');
+const { loadFixtureCases, normalizeEvents, sortByKey } = require('../fixtures/fixtureHelper');
+
+const createGladysContext = () => ({
+  event: {
+    emit: sinon.stub(),
+  },
+});
+
+const forceCloudMode = (device) => ({
+  ...device,
+  params: (Array.isArray(device.params) ? device.params : []).map((param) =>
+    param.name === 'LOCAL_OVERRIDE' ? { ...param, value: false } : param,
+  ),
+});
+
+describe('TuyaHandler.poll fixtures', () => {
+  const cloudCases = loadFixtureCases('pollCloud');
+  const localCases = loadFixtureCases('pollLocal');
+
+  cloudCases.forEach((fixtureCase) => {
+    it(`should poll cloud values for ${fixtureCase.manifest.name} from fixture`, async () => {
+      const { poll } = require('../../../../services/tuya/lib/tuya.poll');
+      const { device, response, expectedEvents } = fixtureCase.manifest.pollCloud;
+      const connector = {
+        request: sinon.stub().resolves(fixtureCase.load(response)),
+      };
+      const gladys = createGladysContext();
+      const cloudDevice = forceCloudMode(fixtureCase.load(device));
+
+      await poll.call(
+        {
+          connector,
+          gladys,
+        },
+        cloudDevice,
+      );
+
+      const emittedEvents = gladys.event.emit
+        .getCalls()
+        .filter((call) => call.args[0] === EVENTS.DEVICE.NEW_STATE);
+      expect(normalizeEvents(emittedEvents)).to.deep.equal(sortByKey(fixtureCase.load(expectedEvents)));
+    });
+  });
+
+  localCases.forEach((fixtureCase) => {
+    it(`should poll local values for ${fixtureCase.manifest.name} from fixture`, async () => {
+      const { device, dps, expectedEvents, expectedCloudRequests = 0 } = fixtureCase.manifest.pollLocal;
+      const localPoll = sinon.stub().resolves({ dps: fixtureCase.load(dps) });
+      const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+        './tuya.localPoll': { localPoll },
+      });
+      const connector = {
+        request: sinon.stub().resolves({ result: [] }),
+      };
+      const gladys = createGladysContext();
+
+      await poll.call(
+        {
+          connector,
+          gladys,
+        },
+        fixtureCase.load(device),
+      );
+
+      const emittedEvents = gladys.event.emit
+        .getCalls()
+        .filter((call) => call.args[0] === EVENTS.DEVICE.NEW_STATE);
+      expect(normalizeEvents(emittedEvents)).to.deep.equal(sortByKey(fixtureCase.load(expectedEvents)));
+      expect(connector.request.callCount).to.equal(expectedCloudRequests);
+    });
+  });
+});
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index 89d5dfeb96..49d5ff5526 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -11,7 +11,6 @@ const connect = proxyquire('../../../../services/tuya/lib/tuya.connect', {
 const TuyaHandler = proxyquire('../../../../services/tuya/lib/index', {
   './tuya.connect.js': connect,
 });
-const { API } = require('../../../../services/tuya/lib/utils/tuya.constants');
 const { EVENTS } = require('../../../../utils/constants');
 
 const { BadParameters } = require('../../../../utils/coreErrors');
@@ -84,31 +83,6 @@ describe('TuyaHandler.poll', () => {
     }
   });
 
-  it('change state of device feature', async () => {
-    await tuyaHandler.poll({
-      external_id: 'tuya:device',
-      features: [
-        {
-          external_id: 'tuya:device:switch_1',
-          category: 'light',
-          type: 'binary',
-        },
-      ],
-    });
-
-    assert.callCount(tuyaHandler.connector.request, 1);
-    assert.calledWith(tuyaHandler.connector.request, {
-      method: 'GET',
-      path: `${API.VERSION_1_0}/devices/device/status`,
-    });
-
-    assert.callCount(gladys.event.emit, 1);
-    assert.calledWith(gladys.event.emit, EVENTS.DEVICE.NEW_STATE, {
-      device_feature_external_id: 'tuya:device:switch_1',
-      state: 1,
-    });
-  });
-
   it('should skip cloud feature when code is missing from payload', async () => {
     await tuyaHandler.poll({
       external_id: 'tuya:device',
diff --git a/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js b/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js
new file mode 100644
index 0000000000..3c339ce9ca
--- /dev/null
+++ b/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js
@@ -0,0 +1,48 @@
+const sinon = require('sinon');
+const { expect } = require('chai');
+const proxyquire = require('proxyquire')
+  .noCallThru()
+  .noPreserveCache();
+
+const { loadFixtureCases } = require('../fixtures/fixtureHelper');
+
+describe('TuyaHandler.setValue fixtures', () => {
+  const fixtureCases = loadFixtureCases('setValueLocal');
+
+  fixtureCases.forEach((fixtureCase) => {
+    it(`should set local value for ${fixtureCase.manifest.name} from fixture`, async () => {
+      const connect = sinon.stub().resolves();
+      const set = sinon.stub().resolves();
+      const disconnect = sinon.stub().resolves();
+
+      function TuyAPIStub() {
+        this.connect = connect;
+        this.set = set;
+        this.disconnect = disconnect;
+      }
+
+      const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
+        tuyapi: TuyAPIStub,
+        '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
+      });
+
+      const { device, featureExternalId, inputValue, expectedLocalSet, expectedCloudRequests = 0 } =
+        fixtureCase.manifest.setValueLocal;
+
+      const currentDevice = fixtureCase.load(device);
+      const currentFeature = currentDevice.features.find((feature) => feature.external_id === featureExternalId);
+      const ctx = {
+        connector: { request: sinon.stub().resolves({}) },
+        gladys: {},
+      };
+
+      await setValue.call(ctx, currentDevice, currentFeature, inputValue);
+
+      expect(connect.calledOnce).to.equal(true);
+      expect(set.calledOnce).to.equal(true);
+      expect(disconnect.calledOnce).to.equal(true);
+      expect(set.firstCall.args[0]).to.deep.equal(expectedLocalSet);
+      expect(ctx.connector.request.callCount).to.equal(expectedCloudRequests);
+    });
+  });
+});
diff --git a/server/test/services/tuya/lib/tuya.setValue.test.js b/server/test/services/tuya/lib/tuya.setValue.test.js
index 3c0e745351..cbc61cbc5a 100644
--- a/server/test/services/tuya/lib/tuya.setValue.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.test.js
@@ -361,7 +361,12 @@ describe('TuyaHandler.setValue', () => {
       gladys: {},
     };
 
-    await expect(tuyaHandler.setValue.call(ctx, device, deviceFeature, 1)).to.be.rejectedWith('have no command');
+    try {
+      await tuyaHandler.setValue.call(ctx, device, deviceFeature, 1);
+      expect.fail('Expected setValue to throw');
+    } catch (error) {
+      expect(error.message).to.include('have no command');
+    }
     expect(ctx.connector.request.called).to.equal(false);
   });
 

From 8d6792a8c0fd71db4d6f57f16c9941c0ea2d2ed3 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 28 Feb 2026 14:38:22 +0100
Subject: [PATCH 55/90] style(tuya): fix smart meter fixture lint and
 formatting

---
 server/services/tuya/lib/mappings/index.js    |  4 +-
 .../tuya/lib/mappings/local/smart-meter.js    | 21 ++++++++-
 .../expected-device.json                      | 43 ++++++++++++++++++-
 .../services/tuya/fixtures/fixtureHelper.js   | 30 +++++++------
 .../device/feature/tuya.deviceMapping.test.js | 43 ++++++++-----------
 .../tuya.convertDevice.fixtures.test.js       |  6 +--
 .../device/tuya.localMapping.fixtures.test.js |  4 +-
 .../tuya/lib/tuya.poll.fixtures.test.js       | 14 ++----
 .../tuya/lib/tuya.setValue.fixtures.test.js   | 14 +++++-
 9 files changed, 117 insertions(+), 62 deletions(-)

diff --git a/server/services/tuya/lib/mappings/index.js b/server/services/tuya/lib/mappings/index.js
index 5cc2b3740c..4bccb1c984 100644
--- a/server/services/tuya/lib/mappings/index.js
+++ b/server/services/tuya/lib/mappings/index.js
@@ -179,7 +179,9 @@ const extractCodesFromThingModel = (thingModel) => {
 
 const extractCodesFromProperties = (propertiesPayload) => {
   const codes = new Set();
-  const properties = Array.isArray(propertiesPayload && propertiesPayload.properties) ? propertiesPayload.properties : [];
+  const properties = Array.isArray(propertiesPayload && propertiesPayload.properties)
+    ? propertiesPayload.properties
+    : [];
 
   properties.forEach((property) => {
     if (!property || !property.code) {
diff --git a/server/services/tuya/lib/mappings/local/smart-meter.js b/server/services/tuya/lib/mappings/local/smart-meter.js
index 5eabaeacca..6a7d13db94 100644
--- a/server/services/tuya/lib/mappings/local/smart-meter.js
+++ b/server/services/tuya/lib/mappings/local/smart-meter.js
@@ -1,6 +1,25 @@
 module.exports = {
   strict: true,
-  ignoredDps: ['102', '103', '104', '110', '116', '117', '118', '119', '120', '121', '122', '123', '124', '125', '126', '127', '128', '129'],
+  ignoredDps: [
+    '102',
+    '103',
+    '104',
+    '110',
+    '116',
+    '117',
+    '118',
+    '119',
+    '120',
+    '121',
+    '122',
+    '123',
+    '124',
+    '125',
+    '126',
+    '127',
+    '128',
+    '129',
+  ],
   codeAliases: {},
   dps: {
     power_a: 101,
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
index 1e74dd2381..75f62e205e 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
@@ -15,8 +15,47 @@
     "PRODUCT_ID": "bbcg1hrkrj5rifsd"
   },
   "tuya_mapping": {
-    "ignored_local_dps": ["102", "103", "104", "110", "116", "117", "118", "119", "120", "121", "122", "123", "124", "125", "126", "127", "128", "129"],
-    "ignored_cloud_codes": ["coef_a_reset", "coef_b_reset", "current_a_calibration", "current_b_calibration", "direction_a", "direction_b", "energy_a_calibration_fwd", "energy_a_calibration_rev", "energy_b_calibration_fwd", "energy_b_calibration_rev", "freq", "freq_calibration", "power_a_calibration", "power_b_calibration", "power_factor", "power_factor_b", "report_rate_control", "tbd", "voltage_coef"]
+    "ignored_local_dps": [
+      "102",
+      "103",
+      "104",
+      "110",
+      "116",
+      "117",
+      "118",
+      "119",
+      "120",
+      "121",
+      "122",
+      "123",
+      "124",
+      "125",
+      "126",
+      "127",
+      "128",
+      "129"
+    ],
+    "ignored_cloud_codes": [
+      "coef_a_reset",
+      "coef_b_reset",
+      "current_a_calibration",
+      "current_b_calibration",
+      "direction_a",
+      "direction_b",
+      "energy_a_calibration_fwd",
+      "energy_a_calibration_rev",
+      "energy_b_calibration_fwd",
+      "energy_b_calibration_rev",
+      "freq",
+      "freq_calibration",
+      "power_a_calibration",
+      "power_b_calibration",
+      "power_factor",
+      "power_factor_b",
+      "report_rate_control",
+      "tbd",
+      "voltage_coef"
+    ]
   },
   "features": [
     {
diff --git a/server/test/services/tuya/fixtures/fixtureHelper.js b/server/test/services/tuya/fixtures/fixtureHelper.js
index ea10c7d9d0..7fea184092 100644
--- a/server/test/services/tuya/fixtures/fixtureHelper.js
+++ b/server/test/services/tuya/fixtures/fixtureHelper.js
@@ -1,7 +1,9 @@
 const fs = require('fs');
+const { createRequire } = require('module');
 const path = require('path');
 
 const FIXTURES_ROOT = path.join(__dirname, 'devices');
+const fixtureRequire = createRequire(__filename);
 
 const sortByKey = (value) => {
   if (Array.isArray(value)) {
@@ -65,19 +67,19 @@ const normalizeFeatures = (features) =>
 
 const normalizeConvertedDevice = (device) =>
   omitUndefined({
-  name: device.name,
-  external_id: device.external_id,
-  selector: device.selector,
-  device_type: device.device_type,
-  model: device.model,
-  product_id: device.product_id,
-  product_key: device.product_key,
-  online: device.online,
-  poll_frequency: device.poll_frequency,
-  should_poll: device.should_poll,
-  params: normalizeParams(device.params),
-  tuya_mapping: sortByKey(device.tuya_mapping),
-  features: normalizeFeatures(device.features),
+    name: device.name,
+    external_id: device.external_id,
+    selector: device.selector,
+    device_type: device.device_type,
+    model: device.model,
+    product_id: device.product_id,
+    product_key: device.product_key,
+    online: device.online,
+    poll_frequency: device.poll_frequency,
+    should_poll: device.should_poll,
+    params: normalizeParams(device.params),
+    tuya_mapping: sortByKey(device.tuya_mapping),
+    features: normalizeFeatures(device.features),
   });
 
 const normalizeEvents = (calls) =>
@@ -94,7 +96,7 @@ const loadFixtureCases = (sectionName) =>
     .sort()
     .map((directoryName) => {
       const fixtureDirectory = path.join(FIXTURES_ROOT, directoryName);
-      const manifest = require(path.join(fixtureDirectory, 'manifest.js'));
+      const manifest = fixtureRequire(path.join(fixtureDirectory, 'manifest.js'));
       if (!manifest[sectionName]) {
         return null;
       }
diff --git a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
index 5637d6735b..ff4d1246e7 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
@@ -131,52 +131,43 @@ describe('Tuya device mapping', () => {
         expect(result).to.eq(235.2);
       });
       it('switch power invalid value returns NaN', () => {
-        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.POWER](
-          'not-a-number',
-        );
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.POWER]('not-a-number');
         expect(Number.isNaN(result)).to.equal(true);
       });
     });
     describe('energy sensor', () => {
       it('switch power invalid value returns NaN', () => {
-        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.POWER](
-          'not-a-number',
-        );
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.POWER]('not-a-number');
         expect(Number.isNaN(result)).to.equal(true);
       });
       it('power with scale', () => {
-        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][DEVICE_FEATURE_TYPES.ENERGY_SENSOR.POWER](
-          '706',
-          { scale: 1 },
-        );
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][
+          DEVICE_FEATURE_TYPES.ENERGY_SENSOR.POWER
+        ]('706', { scale: 1 });
         expect(result).to.eq(70.6);
       });
       it('energy with scale', () => {
-        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][DEVICE_FEATURE_TYPES.ENERGY_SENSOR.ENERGY](
-          '149241',
-          { scale: 2 },
-        );
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][
+          DEVICE_FEATURE_TYPES.ENERGY_SENSOR.ENERGY
+        ]('149241', { scale: 2 });
         expect(result).to.eq(1492.41);
       });
       it('voltage with scale', () => {
-        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][DEVICE_FEATURE_TYPES.ENERGY_SENSOR.VOLTAGE](
-          '2301',
-          { scale: 1 },
-        );
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][
+          DEVICE_FEATURE_TYPES.ENERGY_SENSOR.VOLTAGE
+        ]('2301', { scale: 1 });
         expect(result).to.eq(230.1);
       });
       it('current without scale', () => {
-        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][DEVICE_FEATURE_TYPES.ENERGY_SENSOR.CURRENT](
-          '123',
-          { scale: 0 },
-        );
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][
+          DEVICE_FEATURE_TYPES.ENERGY_SENSOR.CURRENT
+        ]('123', { scale: 0 });
         expect(result).to.eq(123);
       });
       it('production index with scale', () => {
-        const result =
-          readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_PRODUCTION_SENSOR][
-            DEVICE_FEATURE_TYPES.ENERGY_PRODUCTION_SENSOR.INDEX
-          ]('43222', { scale: 2 });
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_PRODUCTION_SENSOR][
+          DEVICE_FEATURE_TYPES.ENERGY_PRODUCTION_SENSOR.INDEX
+        ]('43222', { scale: 2 });
         expect(result).to.eq(432.22);
       });
     });
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js
index 314c65549d..2a1dfef087 100644
--- a/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js
@@ -1,11 +1,7 @@
 const { expect } = require('chai');
 
 const { convertDevice } = require('../../../../../services/tuya/lib/device/tuya.convertDevice');
-const {
-  loadFixtureCases,
-  normalizeConvertedDevice,
-  sortByKey,
-} = require('../../fixtures/fixtureHelper');
+const { loadFixtureCases, normalizeConvertedDevice, sortByKey } = require('../../fixtures/fixtureHelper');
 
 describe('tuya.convertDevice fixtures', () => {
   const fixtureCases = loadFixtureCases('convertDevice');
diff --git a/server/test/services/tuya/lib/device/tuya.localMapping.fixtures.test.js b/server/test/services/tuya/lib/device/tuya.localMapping.fixtures.test.js
index 5e32222204..8994b1cb49 100644
--- a/server/test/services/tuya/lib/device/tuya.localMapping.fixtures.test.js
+++ b/server/test/services/tuya/lib/device/tuya.localMapping.fixtures.test.js
@@ -13,7 +13,9 @@ describe('Tuya local mapping fixtures', () => {
       const expectedMapping = fixtureCase.load(expected);
 
       const resolvedMapping = currentDevice.features.reduce((accumulator, feature) => {
-        const code = String(feature.external_id).split(':').pop();
+        const code = String(feature.external_id)
+          .split(':')
+          .pop();
         accumulator[code] = getLocalDpsFromCode(code, currentDevice);
         return accumulator;
       }, {});
diff --git a/server/test/services/tuya/lib/tuya.poll.fixtures.test.js b/server/test/services/tuya/lib/tuya.poll.fixtures.test.js
index 800db3c542..c10b76b6ae 100644
--- a/server/test/services/tuya/lib/tuya.poll.fixtures.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.fixtures.test.js
@@ -4,6 +4,7 @@ const proxyquire = require('proxyquire').noCallThru();
 
 const { EVENTS } = require('../../../../utils/constants');
 const { loadFixtureCases, normalizeEvents, sortByKey } = require('../fixtures/fixtureHelper');
+const { poll: pollCloud } = require('../../../../services/tuya/lib/tuya.poll');
 
 const createGladysContext = () => ({
   event: {
@@ -24,7 +25,6 @@ describe('TuyaHandler.poll fixtures', () => {
 
   cloudCases.forEach((fixtureCase) => {
     it(`should poll cloud values for ${fixtureCase.manifest.name} from fixture`, async () => {
-      const { poll } = require('../../../../services/tuya/lib/tuya.poll');
       const { device, response, expectedEvents } = fixtureCase.manifest.pollCloud;
       const connector = {
         request: sinon.stub().resolves(fixtureCase.load(response)),
@@ -32,17 +32,14 @@ describe('TuyaHandler.poll fixtures', () => {
       const gladys = createGladysContext();
       const cloudDevice = forceCloudMode(fixtureCase.load(device));
 
-      await poll.call(
+      await pollCloud.call(
         {
           connector,
           gladys,
         },
         cloudDevice,
       );
-
-      const emittedEvents = gladys.event.emit
-        .getCalls()
-        .filter((call) => call.args[0] === EVENTS.DEVICE.NEW_STATE);
+      const emittedEvents = gladys.event.emit.getCalls().filter((call) => call.args[0] === EVENTS.DEVICE.NEW_STATE);
       expect(normalizeEvents(emittedEvents)).to.deep.equal(sortByKey(fixtureCase.load(expectedEvents)));
     });
   });
@@ -66,10 +63,7 @@ describe('TuyaHandler.poll fixtures', () => {
         },
         fixtureCase.load(device),
       );
-
-      const emittedEvents = gladys.event.emit
-        .getCalls()
-        .filter((call) => call.args[0] === EVENTS.DEVICE.NEW_STATE);
+      const emittedEvents = gladys.event.emit.getCalls().filter((call) => call.args[0] === EVENTS.DEVICE.NEW_STATE);
       expect(normalizeEvents(emittedEvents)).to.deep.equal(sortByKey(fixtureCase.load(expectedEvents)));
       expect(connector.request.callCount).to.equal(expectedCloudRequests);
     });
diff --git a/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js b/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js
index 3c339ce9ca..f23a61fed9 100644
--- a/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js
@@ -15,6 +15,11 @@ describe('TuyaHandler.setValue fixtures', () => {
       const set = sinon.stub().resolves();
       const disconnect = sinon.stub().resolves();
 
+      /**
+       * @description Simple TuyAPI test double used for fixture-driven local setValue tests.
+       * @example
+       * new TuyAPIStub();
+       */
       function TuyAPIStub() {
         this.connect = connect;
         this.set = set;
@@ -26,8 +31,13 @@ describe('TuyaHandler.setValue fixtures', () => {
         '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
       });
 
-      const { device, featureExternalId, inputValue, expectedLocalSet, expectedCloudRequests = 0 } =
-        fixtureCase.manifest.setValueLocal;
+      const {
+        device,
+        featureExternalId,
+        inputValue,
+        expectedLocalSet,
+        expectedCloudRequests = 0,
+      } = fixtureCase.manifest.setValueLocal;
 
       const currentDevice = fixtureCase.load(device);
       const currentFeature = currentDevice.features.find((feature) => feature.external_id === featureExternalId);

From f2c785c0712eb0444fd9589b0b30603de9266faf Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 28 Feb 2026 16:41:52 +0100
Subject: [PATCH 56/90] fix(tuya): avoid stale device state in local poll

---
 .../integration/all/tuya/TuyaDeviceBox.jsx      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 92fa856ef3..ac641b77b3 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -552,19 +552,20 @@ class TuyaDeviceBox extends Component {
   };
 
   pollLocal = async () => {
+    const currentDevice = this.state.device;
     this.setState({
       localPollStatus: RequestStatus.Getting,
       localPollError: null,
       localPollProtocol: null,
       localPollDps: null
     });
-    const params = Array.isArray(this.state.device.params) ? this.state.device.params : [];
+    const params = Array.isArray(currentDevice.params) ? currentDevice.params : [];
     const getParam = name => {
       const found = params.find(param => param.name === name);
       return found ? found.value : undefined;
     };
     const tryProtocols = ['3.5', '3.4', '3.3', '3.1'];
-    const selectedProtocol = getParam('PROTOCOL_VERSION') || this.state.device.protocol_version;
+    const selectedProtocol = getParam('PROTOCOL_VERSION') || currentDevice.protocol_version;
     const protocolList = selectedProtocol ? [selectedProtocol] : tryProtocols;
     try {
       let result = null;
@@ -578,11 +579,11 @@ class TuyaDeviceBox extends Component {
             localPollProtocol: protocolVersion
           });
           const response = await this.props.httpClient.post('/api/v1/service/tuya/local-poll', {
-            deviceId: this.state.device.external_id
-              ? this.state.device.external_id.split(':')[1] || this.state.device.external_id
+            deviceId: currentDevice.external_id
+              ? currentDevice.external_id.split(':')[1] || currentDevice.external_id
               : undefined,
-            ip: getParam('IP_ADDRESS') || this.state.device.ip,
-            localKey: getParam('LOCAL_KEY') || this.state.device.local_key,
+            ip: getParam('IP_ADDRESS') || currentDevice.ip,
+            localKey: getParam('LOCAL_KEY') || currentDevice.local_key,
             protocolVersion,
             timeoutMs: 3000,
             fastScan: true
@@ -612,7 +613,7 @@ class TuyaDeviceBox extends Component {
           newParams.push({ name: 'PROTOCOL_VERSION', value: usedProtocol });
         }
       }
-      const baseDevice = latestDevice || this.state.device;
+      const baseDevice = latestDevice || currentDevice;
       this.setState({
         device: {
           ...baseDevice,
@@ -621,7 +622,7 @@ class TuyaDeviceBox extends Component {
         localPollStatus: RequestStatus.Success,
         localPollProtocol: null,
         localPollValidation: {
-          ip: getParam('IP_ADDRESS') || this.state.device.ip || '',
+          ip: getParam('IP_ADDRESS') || currentDevice.ip || '',
           protocol: usedProtocol || '',
           localOverride: true
         },

From 53d9f8be61e8e20dfd016d29732f1ac2e7c5bba8 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 28 Feb 2026 17:06:47 +0100
Subject: [PATCH 57/90] fix(tuya): align feature code parsing and test labels

---
 server/services/tuya/lib/mappings/index.js            |  4 ++--
 server/test/services/tuya/lib/mappings/index.test.js  | 11 +++++++++--
 .../services/tuya/lib/utils/tuya.deviceParams.test.js |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/server/services/tuya/lib/mappings/index.js b/server/services/tuya/lib/mappings/index.js
index 4bccb1c984..9efb50d408 100644
--- a/server/services/tuya/lib/mappings/index.js
+++ b/server/services/tuya/lib/mappings/index.js
@@ -149,8 +149,8 @@ const extractCodesFromFeatures = (features) => {
       return;
     }
     const parts = String(feature.external_id).split(':');
-    if (parts.length >= 3) {
-      const code = parts[2];
+    if (parts.length >= 2) {
+      const code = parts[parts.length - 1];
       if (code) {
         codes.add(String(code).toLowerCase());
       }
diff --git a/server/test/services/tuya/lib/mappings/index.test.js b/server/test/services/tuya/lib/mappings/index.test.js
index 1a4a0d7cf9..e330552660 100644
--- a/server/test/services/tuya/lib/mappings/index.test.js
+++ b/server/test/services/tuya/lib/mappings/index.test.js
@@ -38,9 +38,16 @@ describe('Tuya mappings index', () => {
     const empty = extractCodesFromFeatures(null);
     expect(empty.size).to.equal(0);
 
-    const codes = extractCodesFromFeatures([{}, { external_id: 'tuya:device:switch' }, { external_id: 'tuya:device' }]);
+    const codes = extractCodesFromFeatures([
+      {},
+      { external_id: 'tuya:device:switch' },
+      { external_id: 'tuya:device' },
+      { external_id: 'tuya:device:sub:switch_2' },
+    ]);
     expect(codes.has('switch')).to.equal(true);
-    expect(codes.size).to.equal(1);
+    expect(codes.has('switch_2')).to.equal(true);
+    expect(codes.has('device')).to.equal(true);
+    expect(codes.size).to.equal(3);
   });
 
   it('should build cloud and local mappings', () => {
diff --git a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
index ff30e16be6..1850829ca1 100644
--- a/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
+++ b/server/test/services/tuya/lib/utils/tuya.deviceParams.test.js
@@ -27,7 +27,7 @@ describe('Tuya device params utils', () => {
     expect(params).to.deep.equal([{ name: 'test', value: 1 }]);
   });
 
-  it('should get param value using device param constants', () => {
+  it('should get param value', () => {
     const value = getParamValue([{ name: 'A', value: 42 }], 'A');
     expect(value).to.equal(42);
     expect(getParamValue([{ name: 'A', value: 42 }], 'B')).to.equal(undefined);
@@ -48,7 +48,7 @@ describe('Tuya device params utils', () => {
     expect(other.value).to.equal('x');
   });
 
-  it('should get param value', () => {
+  it('should get param value using device param constants', () => {
     const params = [
       { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '1.1.1.1' },
       { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.3' },

From cdfe22c2ce9c07a321173a5cb024806f143af0c0 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 28 Feb 2026 17:25:42 +0100
Subject: [PATCH 58/90] fix(tuya): move setup side effects to componentDidMount

---
 front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 17a5b696dd..6c75d38668 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -26,7 +26,7 @@ class SetupTab extends Component {
     };
   }
 
-  componentWillMount() {
+  componentDidMount() {
     this.getTuyaConfiguration();
     this.getTuyaStatus();
     this.props.session.dispatcher.addListener(WEBSOCKET_MESSAGE_TYPES.TUYA.STATUS, this.updateConnectionStatus);

From 8f2657abdc2ba6024a454f656c40f5e63408adc9 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 28 Feb 2026 17:48:32 +0100
Subject: [PATCH 59/90] fix(tuya): surface setup variable fetch failures

---
 .../src/routes/integration/all/tuya/setup-page/SetupTab.jsx  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 6c75d38668..80bc3496c1 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -58,7 +58,10 @@ class SetupTab extends Component {
         const response = await this.props.httpClient.get(`/api/v1/service/tuya/variable/${name}`);
         return response && response.value ? response.value : fallback;
       } catch (e) {
-        return fallback;
+        if (e && e.response && e.response.status === 404) {
+          return fallback;
+        }
+        throw e;
       }
     };
 

From 129aa4b64588b8d4a9350d61a6f7e332625bbe60 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 28 Feb 2026 17:50:09 +0100
Subject: [PATCH 60/90] fix(tuya): harden type detection and poll handling

---
 server/services/tuya/lib/mappings/index.js    | 16 ++---
 server/services/tuya/lib/tuya.poll.js         |  8 ++-
 .../services/tuya/lib/mappings/index.test.js  | 10 ++++
 .../services/tuya/lib/tuya.localPoll.test.js  |  4 +-
 .../test/services/tuya/lib/tuya.poll.test.js  | 58 +++++++++++++++++++
 5 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/server/services/tuya/lib/mappings/index.js b/server/services/tuya/lib/mappings/index.js
index 9efb50d408..1b0c162071 100644
--- a/server/services/tuya/lib/mappings/index.js
+++ b/server/services/tuya/lib/mappings/index.js
@@ -199,16 +199,12 @@ const getDeviceType = (device) => {
   }
 
   const specifications = device.specifications || {};
-  let codes = extractCodesFromSpecifications(specifications);
-  if (codes.size === 0) {
-    codes = extractCodesFromThingModel(device.thing_model);
-  }
-  if (codes.size === 0) {
-    codes = extractCodesFromProperties(device.properties);
-  }
-  if (codes.size === 0) {
-    codes = extractCodesFromFeatures(device.features);
-  }
+  const codes = new Set([
+    ...extractCodesFromSpecifications(specifications),
+    ...extractCodesFromThingModel(device.thing_model),
+    ...extractCodesFromProperties(device.properties),
+    ...extractCodesFromFeatures(device.features),
+  ]);
 
   const modelName = [device.model, device.product_name, device.name]
     .filter((value) => typeof value === 'string' && value.length > 0)
diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index 22c9d879b3..090fa070f3 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -121,7 +121,10 @@ const pollCloudFeatures = async function pollCloudFeatures(deviceFeatures, topic
   const values = {};
   const result = Array.isArray(response && response.result) ? response.result : [];
   result.forEach((feature) => {
-    values[feature.code] = feature.value;
+    if (!feature || typeof feature !== 'object' || feature.code === undefined || feature.code === null) {
+      return;
+    }
+    values[String(feature.code)] = feature.value;
   });
 
   deviceFeatures.forEach((deviceFeature) => {
@@ -277,6 +280,9 @@ async function poll(device) {
         );
         return;
       }
+
+      fallbackReason = 'invalid_local_payload';
+      logger.warn(`[Tuya][poll] local poll returned invalid DPS payload for ${topic}, falling back to cloud`);
     } catch (e) {
       logger.warn(`[Tuya][poll] local poll failed for ${topic}, falling back to cloud`, e);
       fallbackReason = 'local_poll_failed';
diff --git a/server/test/services/tuya/lib/mappings/index.test.js b/server/test/services/tuya/lib/mappings/index.test.js
index e330552660..9bb7641974 100644
--- a/server/test/services/tuya/lib/mappings/index.test.js
+++ b/server/test/services/tuya/lib/mappings/index.test.js
@@ -137,6 +137,16 @@ describe('Tuya mappings index', () => {
       model: 'DIN Smart Meter',
     });
     expect(smartMeterByThingModel).to.equal(DEVICE_TYPES.SMART_METER);
+
+    const socketByMergedSources = getDeviceType({
+      specifications: {
+        functions: [{ code: 'timer' }],
+        status: [],
+      },
+      features: [{ external_id: 'tuya:device:switch_1' }],
+      model: 'Wifi Plug Mini',
+    });
+    expect(socketByMergedSources).to.equal(DEVICE_TYPES.SMART_SOCKET);
   });
 
   it('should get feature mapping and ignore invalid candidates', () => {
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index d4bf90fb25..f57d92b274 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -222,7 +222,7 @@ describe('TuyaHandler.localPoll', () => {
     throw new Error('Expected error');
   });
 
-  it('should log last socket error when different from thrown error', async () => {
+  it('should keep the original connect error when a socket error also occurs', async () => {
     const connect = sinon.stub().rejects(new Error('connect failed'));
     const get = sinon.stub();
     const disconnect = sinon.stub().resolves();
@@ -257,7 +257,7 @@ describe('TuyaHandler.localPoll', () => {
     throw new Error('Expected error');
   });
 
-  it('should stop cleanup when already resolved', async () => {
+  it('should propagate cleanup errors after a successful poll', async () => {
     const connect = sinon.stub().resolves();
     const get = sinon.stub().resolves({ dps: { 1: true } });
     const disconnect = sinon.stub().resolves();
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index 49d5ff5526..1972b7566d 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -344,6 +344,31 @@ describe('TuyaHandler.poll additional branch coverage', () => {
     expect(logger.warn.calledOnce).to.equal(true);
   });
 
+  it('should ignore malformed cloud status entries', async () => {
+    const request = sinon.stub().resolves({ result: [null, 'bad', { value: true }, { code: 'switch_1', value: true }] });
+    const emit = sinon.stub();
+    const logger = { debug: sinon.stub(), warn: sinon.stub() };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      '../../../utils/logger': logger,
+    });
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: { event: { emit } },
+      },
+      {
+        external_id: 'tuya:device',
+        params: [{ name: 'LOCAL_OVERRIDE', value: false }],
+        features: [{ external_id: 'tuya:device:switch_1', category: 'switch', type: 'binary' }],
+      },
+    );
+
+    expect(request.calledOnce).to.equal(true);
+    expect(emit.calledOnce).to.equal(true);
+    expect(emit.firstCall.args[1].state).to.equal(1);
+  });
+
   it('should skip cloud features when code or reader is missing', async () => {
     const request = sinon.stub().resolves({ result: [{ code: 'switch_1', value: true }] });
     const emit = sinon.stub();
@@ -400,6 +425,39 @@ describe('TuyaHandler.poll additional branch coverage', () => {
     expect(request.calledOnce).to.equal(true);
   });
 
+  it('should warn and fallback to cloud when local payload has no dps object', async () => {
+    const localPoll = sinon.stub().resolves({});
+    const request = sinon.stub().resolves({ result: [{ code: 'switch_1', value: true }] });
+    const emit = sinon.stub();
+    const logger = { debug: sinon.stub(), warn: sinon.stub() };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+      '../../../utils/logger': logger,
+    });
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: { event: { emit } },
+      },
+      {
+        external_id: 'tuya:device',
+        params: [
+          { name: 'IP_ADDRESS', value: '1.1.1.1' },
+          { name: 'LOCAL_KEY', value: 'key' },
+          { name: 'PROTOCOL_VERSION', value: '3.3' },
+          { name: 'LOCAL_OVERRIDE', value: true },
+        ],
+        features: [{ external_id: 'tuya:device:switch_1', category: 'switch', type: 'binary' }],
+      },
+    );
+
+    expect(localPoll.calledOnce).to.equal(true);
+    expect(request.calledOnce).to.equal(true);
+    expect(logger.warn.calledOnce).to.equal(true);
+    expect(logger.warn.firstCall.args[0]).to.include('invalid DPS payload');
+  });
+
   it('should fallback to cloud when local dps value is undefined', async () => {
     const localPoll = sinon.stub().resolves({ dps: { 1: undefined } });
     const request = sinon.stub().resolves({ result: [{ code: 'switch_1', value: true }] });

From 8d393ec2a1bedb8392fb5316a92789f5c32919d5 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sat, 28 Feb 2026 20:12:52 +0100
Subject: [PATCH 61/90] test(tuya): align fixture branch regression coverage

---
 .../services/tuya/lib/tuya.localScan.test.js  |  2 +-
 .../test/services/tuya/lib/tuya.poll.test.js  | 28 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index cb5f7585dc..45f5dbaeff 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -250,7 +250,7 @@ describe('TuyaHandler.localScan', () => {
     });
   });
 
-  it('should log listening address when available', async () => {
+  it('should complete local scan when listening address is available', async () => {
     const sockets = [];
     const dgramStub = {
       createSocket: () => {
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index 1972b7566d..239f23bf19 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -323,6 +323,30 @@ describe('TuyaHandler.poll with local mapping', () => {
 });
 
 describe('TuyaHandler.poll additional branch coverage', () => {
+  it('should not throw when features payload is not an array', async () => {
+    const request = sinon.stub().resolves({ result: [{ code: 'switch_1', value: true }] });
+    const emit = sinon.stub();
+    const logger = { debug: sinon.stub(), warn: sinon.stub() };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      '../../../utils/logger': logger,
+    });
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: { event: { emit } },
+      },
+      {
+        external_id: 'tuya:device',
+        params: [{ name: 'LOCAL_OVERRIDE', value: false }],
+        features: null,
+      },
+    );
+
+    expect(request.called).to.equal(false);
+    expect(emit.called).to.equal(false);
+  });
+
   it('should warn and return when cloud connector is unavailable', async () => {
     const logger = { debug: sinon.stub(), warn: sinon.stub() };
     const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
@@ -345,7 +369,9 @@ describe('TuyaHandler.poll additional branch coverage', () => {
   });
 
   it('should ignore malformed cloud status entries', async () => {
-    const request = sinon.stub().resolves({ result: [null, 'bad', { value: true }, { code: 'switch_1', value: true }] });
+    const request = sinon
+      .stub()
+      .resolves({ result: [null, 'bad', { value: true }, { code: 'switch_1', value: true }] });
     const emit = sinon.stub();
     const logger = { debug: sinon.stub(), warn: sinon.stub() };
     const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {

From 9863511bd92f905035ab58787a3acda39566cb62 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 11:39:40 +0100
Subject: [PATCH 62/90] fix(tuya): harden poll readers and regression tests

---
 server/services/tuya/lib/tuya.poll.js         | 18 +++-
 .../services/tuya/lib/tuya.localScan.test.js  |  7 +-
 .../test/services/tuya/lib/tuya.poll.test.js  | 94 +++++++++++++++++++
 3 files changed, 116 insertions(+), 3 deletions(-)

diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index 090fa070f3..c89ce3cf88 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -145,7 +145,14 @@ const pollCloudFeatures = async function pollCloudFeatures(deviceFeatures, topic
       summary.missing += 1;
       return;
     }
-    const transformedValue = reader(value, deviceFeature);
+    let transformedValue;
+    try {
+      transformedValue = reader(value, deviceFeature);
+    } catch (e) {
+      summary.skipped += 1;
+      logger.warn(`[Tuya][poll][cloud] reader failed for device=${topic} code=${code}`, e);
+      return;
+    }
     const { lastValue, lastValueChanged } = getCurrentFeatureState(this.gladys, deviceFeature);
     const { changed } = emitFeatureState(this.gladys, deviceFeature, transformedValue, lastValue, lastValueChanged);
     if (changed) {
@@ -244,7 +251,14 @@ async function poll(device) {
             pendingCloudFeatures.push(deviceFeature);
             return;
           }
-          const transformedValue = reader(rawValue, deviceFeature);
+          let transformedValue;
+          try {
+            transformedValue = reader(rawValue, deviceFeature);
+          } catch (e) {
+            pendingCloudFeatures.push(deviceFeature);
+            logger.warn(`[Tuya][poll] local reader failed for device=${topic} code=${code}; falling back to cloud`, e);
+            return;
+          }
           const { lastValue, lastValueChanged } = getCurrentFeatureState(this.gladys, deviceFeature);
           const { changed } = emitFeatureState(
             this.gladys,
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index 45f5dbaeff..6df2f6f05e 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -288,8 +288,13 @@ describe('TuyaHandler.localScan', () => {
     const clock = sinon.useFakeTimers();
     const promise = localScan(1);
     await clock.tickAsync(1100);
-    await promise;
+    const result = await promise;
     clock.restore();
+
+    expect(result).to.deep.equal({
+      devices: {},
+      portErrors: {},
+    });
   });
 });
 
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index 239f23bf19..8b2163b5ee 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -59,6 +59,7 @@ describe('TuyaHandler.poll', () => {
           },
         ],
       });
+      expect.fail('Expected BadParameters to be thrown');
     } catch (error) {
       expect(error).to.be.an.instanceof(BadParameters);
       expect(error.message).to.equal('Tuya device external_id is invalid: "test:device" should starts with "tuya:"');
@@ -77,6 +78,7 @@ describe('TuyaHandler.poll', () => {
           },
         ],
       });
+      expect.fail('Expected BadParameters to be thrown');
     } catch (error) {
       expect(error).to.be.an.instanceof(BadParameters);
       expect(error.message).to.equal('Tuya device external_id is invalid: "tuya" have no network indicator');
@@ -95,9 +97,54 @@ describe('TuyaHandler.poll', () => {
       ],
     });
 
+    assert.callCount(tuyaHandler.connector.request, 1);
+    assert.calledWith(tuyaHandler.connector.request, {
+      method: 'GET',
+      path: `${API.VERSION_1_0}/devices/device/status`,
+    });
     assert.callCount(gladys.event.emit, 0);
   });
 
+  it('should continue cloud poll when one reader throws', async () => {
+    tuyaHandler.connector.request = sinon.stub().resolves({
+      result: [
+        { code: 'colour_data', value: '{' },
+        { code: 'switch_1', value: true },
+      ],
+    });
+    const logger = {
+      debug: sinon.stub(),
+      warn: sinon.stub(),
+    };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      '../../../utils/logger': logger,
+    });
+
+    await poll.call(tuyaHandler, {
+      external_id: 'tuya:device',
+      features: [
+        {
+          external_id: 'tuya:device:colour_data',
+          category: 'light',
+          type: 'color',
+        },
+        {
+          external_id: 'tuya:device:switch_1',
+          category: 'light',
+          type: 'binary',
+        },
+      ],
+    });
+
+    assert.callCount(logger.warn, 1);
+    expect(logger.warn.firstCall.args[0]).to.include('reader failed');
+    assert.callCount(gladys.event.emit, 1);
+    assert.calledWith(gladys.event.emit, EVENTS.DEVICE.NEW_STATE, {
+      device_feature_external_id: 'tuya:device:switch_1',
+      state: 1,
+    });
+  });
+
   it('should return without cloud request when feature list is empty', async () => {
     await tuyaHandler.poll({
       external_id: 'tuya:device',
@@ -515,6 +562,53 @@ describe('TuyaHandler.poll additional branch coverage', () => {
     expect(request.calledOnce).to.equal(true);
   });
 
+  it('should warn and fallback to cloud when local reader throws', async () => {
+    const localPoll = sinon.stub().resolves({ dps: { 1: true } });
+    const request = sinon.stub().resolves({ result: [{ code: 'switch_1', value: false }] });
+    const emit = sinon.stub();
+    const logger = { debug: sinon.stub(), warn: sinon.stub() };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+      '../../../utils/logger': logger,
+      './device/tuya.deviceMapping': {
+        readValues: {
+          switch: {
+            binary: (value) => {
+              if (value === true) {
+                throw new Error('bad local value');
+              }
+              return 0;
+            },
+          },
+        },
+      },
+    });
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: { event: { emit } },
+      },
+      {
+        external_id: 'tuya:device',
+        params: [
+          { name: 'IP_ADDRESS', value: '1.1.1.1' },
+          { name: 'LOCAL_KEY', value: 'key' },
+          { name: 'PROTOCOL_VERSION', value: '3.3' },
+          { name: 'LOCAL_OVERRIDE', value: true },
+        ],
+        features: [{ external_id: 'tuya:device:switch_1', category: 'switch', type: 'binary' }],
+      },
+    );
+
+    expect(localPoll.calledOnce).to.equal(true);
+    expect(request.calledOnce).to.equal(true);
+    expect(logger.warn.calledOnce).to.equal(true);
+    expect(logger.warn.firstCall.args[0]).to.include('local reader failed');
+    expect(emit.calledOnce).to.equal(true);
+    expect(emit.firstCall.args[1].state).to.equal(0);
+  });
+
   it('should warn when cloud fallback fails after local success', async () => {
     const localPoll = sinon.stub().resolves({ dps: { 1: true } });
     const request = sinon.stub().rejects(new Error('cloud down'));

From 94d96ceb32ebf071353c8d1161ca072499d91134 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 11:56:29 +0100
Subject: [PATCH 63/90] fix(tuya): preserve latest params after local poll

---
 front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index ac641b77b3..6e18145e0a 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -604,7 +604,9 @@ class TuyaDeviceBox extends Component {
           }
         }
       }
-      const newParams = [...params];
+      const baseDevice = latestDevice || currentDevice;
+      const baseParams = Array.isArray(baseDevice.params) ? [...baseDevice.params] : [];
+      const newParams = baseParams;
       if (usedProtocol) {
         const protocolIndex = newParams.findIndex(param => param.name === 'PROTOCOL_VERSION');
         if (protocolIndex >= 0) {
@@ -613,7 +615,6 @@ class TuyaDeviceBox extends Component {
           newParams.push({ name: 'PROTOCOL_VERSION', value: usedProtocol });
         }
       }
-      const baseDevice = latestDevice || currentDevice;
       this.setState({
         device: {
           ...baseDevice,

From ec26853e8ad89bdaf0c529cf3371075f11f58a1e Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 10:35:55 +0100
Subject: [PATCH 64/90] fix(tuya): harden baseline setup and cloud loading

---
 .../all/tuya/setup-page/SetupTab.jsx          |  4 ++-
 server/services/tuya/lib/tuya.loadDevices.js  |  6 +++++
 .../tuya/lib/tuya.manualDisconnect.js         |  2 +-
 .../services/tuya/lib/tuya.disconnect.test.js |  1 +
 .../tuya/lib/tuya.loadDevices.test.js         | 25 +++++++++++++++++++
 .../tuya/lib/tuya.manualDisconnect.test.js    |  2 +-
 6 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 80bc3496c1..52c3e449ab 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -329,10 +329,12 @@ class SetupTab extends Component {
         tuyaConnectionStatus: null
       });
     } catch (e) {
+      const responseMessage =
+        (e && e.response && e.response.data && e.response.data.message) || (e && e.message) || 'unknown';
       this.setState({
         tuyaDisconnecting: false,
         tuyaConnectionStatus: RequestStatus.Error,
-        tuyaConnectionError: (e && e.message) || 'unknown'
+        tuyaConnectionError: responseMessage
       });
     }
   };
diff --git a/server/services/tuya/lib/tuya.loadDevices.js b/server/services/tuya/lib/tuya.loadDevices.js
index 5499583fa0..9f7550e5c5 100644
--- a/server/services/tuya/lib/tuya.loadDevices.js
+++ b/server/services/tuya/lib/tuya.loadDevices.js
@@ -17,6 +17,9 @@ async function loadDevices(pageNo = 1, pageSize = 100) {
     throw new Error('pageSize must be a positive integer');
   }
   const sourceId = await this.gladys.variable.getValue(GLADYS_VARIABLES.APP_ACCOUNT_UID, this.serviceId);
+  if (!sourceId) {
+    throw new Error('Tuya APP_ACCOUNT_UID is missing');
+  }
 
   const responsePage = await this.connector.request({
     method: 'GET',
@@ -42,6 +45,9 @@ async function loadDevices(pageNo = 1, pageSize = 100) {
   }
 
   if (hasMore) {
+    if (list.length === 0) {
+      throw new Error('Tuya API pagination did not advance (has_more=true with empty page)');
+    }
     const nextResult = await this.loadDevices(pageNo + 1, pageSize);
     list.push(...nextResult);
   }
diff --git a/server/services/tuya/lib/tuya.manualDisconnect.js b/server/services/tuya/lib/tuya.manualDisconnect.js
index 71d2151bc3..732f1f877e 100644
--- a/server/services/tuya/lib/tuya.manualDisconnect.js
+++ b/server/services/tuya/lib/tuya.manualDisconnect.js
@@ -6,7 +6,7 @@ const { GLADYS_VARIABLES } = require('./utils/tuya.constants');
  * await manualDisconnect();
  */
 async function manualDisconnect() {
-  await this.gladys.variable.setValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, true, this.serviceId);
+  await this.gladys.variable.setValue(GLADYS_VARIABLES.MANUAL_DISCONNECT, 'true', this.serviceId);
   await this.disconnect({ manual: true });
 }
 
diff --git a/server/test/services/tuya/lib/tuya.disconnect.test.js b/server/test/services/tuya/lib/tuya.disconnect.test.js
index e76dd5d006..0479365b65 100644
--- a/server/test/services/tuya/lib/tuya.disconnect.test.js
+++ b/server/test/services/tuya/lib/tuya.disconnect.test.js
@@ -17,6 +17,7 @@ describe('TuyaHandler.disconnect', () => {
 
   beforeEach(() => {
     tuyaHandler.status = 'UNKNOWN';
+    gladys.event.emit.resetHistory();
   });
 
   it('should reset attributes', () => {
diff --git a/server/test/services/tuya/lib/tuya.loadDevices.test.js b/server/test/services/tuya/lib/tuya.loadDevices.test.js
index e3bd4d70ee..80d9c15d27 100644
--- a/server/test/services/tuya/lib/tuya.loadDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDevices.test.js
@@ -18,6 +18,7 @@ describe('TuyaHandler.loadDevices', () => {
 
   beforeEach(() => {
     sinon.reset();
+    gladys.variable.getValue = fake.resolves('APP_ACCOUNT_UID');
     tuyaHandler.connector = {
       request: sinon
         .stub()
@@ -106,4 +107,28 @@ describe('TuyaHandler.loadDevices', () => {
       expect(e.message).to.equal('Tuya API returned no response');
     }
   });
+
+  it('should throw when app account uid is missing', async () => {
+    gladys.variable.getValue = sinon.fake.resolves(null);
+
+    try {
+      await tuyaHandler.loadDevices(1, 1);
+      assert.fail();
+    } catch (e) {
+      expect(e.message).to.equal('Tuya APP_ACCOUNT_UID is missing');
+    }
+  });
+
+  it('should throw when pagination does not advance', async () => {
+    tuyaHandler.connector.request = sinon.stub().resolves({
+      result: { list: [], has_more: true },
+    });
+
+    try {
+      await tuyaHandler.loadDevices(1, 1);
+      assert.fail();
+    } catch (e) {
+      expect(e.message).to.equal('Tuya API pagination did not advance (has_more=true with empty page)');
+    }
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.manualDisconnect.test.js b/server/test/services/tuya/lib/tuya.manualDisconnect.test.js
index 7d1f0ffa55..a0b0a143c8 100644
--- a/server/test/services/tuya/lib/tuya.manualDisconnect.test.js
+++ b/server/test/services/tuya/lib/tuya.manualDisconnect.test.js
@@ -29,7 +29,7 @@ describe('TuyaHandler.manualDisconnect', () => {
 
     await tuyaHandler.manualDisconnect();
 
-    assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, true, serviceId);
+    assert.calledWith(gladys.variable.setValue, GLADYS_VARIABLES.MANUAL_DISCONNECT, 'true', serviceId);
     assert.calledWith(disconnectStub, { manual: true });
   });
 });

From c55a6e13b98131d701417f76bcb0bbfcef27fe2c Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 13:51:39 +0100
Subject: [PATCH 65/90] fix(tuya): improve setup alerts and baseline test
 isolation

---
 .../all/tuya/setup-page/SetupTab.jsx          | 30 ++++++++++++++-----
 .../services/tuya/lib/tuya.disconnect.test.js |  1 +
 .../tuya/lib/tuya.discoverDevices.test.js     |  4 +++
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 52c3e449ab..5f788bb18c 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -293,12 +293,11 @@ class SetupTab extends Component {
     const { name, value } = e.target;
     this.setState(prevState => {
       const nextState = { ...prevState, [name]: value };
-      const configured = !!(
-        nextState.tuyaEndpoint &&
-        nextState.tuyaAccessKey &&
-        nextState.tuyaSecretKey &&
-        nextState.tuyaAppAccountId
-      );
+      const tuyaEndpoint = (nextState.tuyaEndpoint || '').trim();
+      const tuyaAccessKey = (nextState.tuyaAccessKey || '').trim();
+      const tuyaSecretKey = (nextState.tuyaSecretKey || '').trim();
+      const tuyaAppAccountId = (nextState.tuyaAppAccountId || '').trim();
+      const configured = !!(tuyaEndpoint && tuyaAccessKey && tuyaSecretKey && tuyaAppAccountId);
       return {
         [name]: value,
         tuyaConfigured: configured
@@ -340,6 +339,10 @@ class SetupTab extends Component {
   };
 
   render(props, state) {
+    const showUnexpectedDisconnect = state.tuyaDisconnected && state.tuyaConfigured;
+    const showConnectionError = state.tuyaConnectionStatus === RequestStatus.Error;
+    const showCombinedDisconnectError = showUnexpectedDisconnect && showConnectionError;
+
     return (
       <div class="card">
         <div class="card-header">
@@ -400,12 +403,23 @@ class SetupTab extends Component {
                   />
                 </p>
               )}
-              {state.tuyaDisconnected && state.tuyaConfigured && (
+              {showCombinedDisconnectError && (
+                <div class="alert alert-danger">
+                  <MarkupText id="integration.tuya.setup.disconnectedUnexpected" />
+                  <div class="mt-2">
+                    <Text id="integration.tuya.setup.connectionError" />
+                  </div>
+                  {state.tuyaConnectionError && (
+                    <div class="mt-2">{this.renderTuyaError(state.tuyaConnectionError)}</div>
+                  )}
+                </div>
+              )}
+              {showUnexpectedDisconnect && !showConnectionError && (
                 <p class="alert alert-danger">
                   <MarkupText id="integration.tuya.setup.disconnectedUnexpected" />
                 </p>
               )}
-              {state.tuyaConnectionStatus === RequestStatus.Error && (
+              {showConnectionError && !showUnexpectedDisconnect && (
                 <div class="alert alert-danger">
                   <Text id="integration.tuya.setup.connectionError" />
                   {state.tuyaConnectionError && (
diff --git a/server/test/services/tuya/lib/tuya.disconnect.test.js b/server/test/services/tuya/lib/tuya.disconnect.test.js
index 0479365b65..0d8ce679bb 100644
--- a/server/test/services/tuya/lib/tuya.disconnect.test.js
+++ b/server/test/services/tuya/lib/tuya.disconnect.test.js
@@ -17,6 +17,7 @@ describe('TuyaHandler.disconnect', () => {
 
   beforeEach(() => {
     tuyaHandler.status = 'UNKNOWN';
+    tuyaHandler.lastError = 'previous-error';
     gladys.event.emit.resetHistory();
   });
 
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index 5c374e9503..402894cf85 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -29,6 +29,10 @@ describe('TuyaHandler.discoverDevices', () => {
 
   beforeEach(() => {
     sinon.reset();
+    gladys.event.emit = fake.resolves(null);
+    gladys.stateManager.get = fake.returns(null);
+    gladys.variable.getValue = fake.resolves('APP_ACCOUNT_UID');
+    gladys.device.get = fake.resolves([]);
     tuyaHandler.status = STATUS.CONNECTED;
     tuyaHandler.connector = {
       request: sinon

From 74138b5c67561698e37cbba870771838298b2ec0 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 13:56:34 +0100
Subject: [PATCH 66/90] fix(tuya): sanitize local timeouts and persist
 local-only devices

---
 server/services/tuya/lib/tuya.localPoll.js    |  4 +-
 server/services/tuya/lib/tuya.localScan.js    |  1 +
 .../services/tuya/lib/tuya.localPoll.test.js  | 42 +++++++++++++++++++
 .../services/tuya/lib/tuya.localScan.test.js  | 28 +++++++++++++
 4 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/server/services/tuya/lib/tuya.localPoll.js b/server/services/tuya/lib/tuya.localPoll.js
index f21e89e249..4cab54e836 100644
--- a/server/services/tuya/lib/tuya.localPoll.js
+++ b/server/services/tuya/lib/tuya.localPoll.js
@@ -17,7 +17,9 @@ const { addFallbackBinaryFeature } = require('./device/tuya.localMapping');
 async function localPoll(payload) {
   const { deviceId, ip, localKey, protocolVersion, timeoutMs = 3000, fastScan = false, logDps = true } = payload || {};
   const isProtocol35 = protocolVersion === '3.5';
-  const effectiveTimeout = isProtocol35 && !fastScan ? Math.max(timeoutMs, 5000) : timeoutMs;
+  const parsedTimeout = Number(timeoutMs);
+  const sanitizedTimeout = Number.isFinite(parsedTimeout) ? Math.min(Math.max(parsedTimeout, 500), 30000) : 3000;
+  const effectiveTimeout = isProtocol35 && !fastScan ? Math.max(sanitizedTimeout, 5000) : sanitizedTimeout;
   const TuyaLocalApi = isProtocol35 ? TuyAPINewGen : TuyAPI;
 
   if (!deviceId || !ip || !localKey || !protocolVersion) {
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index 512a031ea4..6ad1e686f1 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -188,6 +188,7 @@ function buildLocalScanResponse(tuyaManager, localScanResult) {
     const localDiscoveredDevices = Object.entries(localDevicesById)
       .map(([deviceId, localInfo]) => buildLocalDiscoveredDevice(deviceId, localInfo))
       .map((device) => mergeWithExisting(device));
+    tuyaManager.discoveredDevices = localDiscoveredDevices;
     return {
       devices: localDiscoveredDevices,
       local_devices: localDevicesById,
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index f57d92b274..6640af35dd 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -186,6 +186,48 @@ describe('TuyaHandler.localPoll', () => {
     }
   });
 
+  it('should sanitize too-low timeoutMs before timing out', async () => {
+    const clock = sinon.useFakeTimers();
+    try {
+      const connect = sinon.stub().resolves();
+      const get = sinon.stub().returns(new Promise(() => {}));
+      const disconnect = sinon.stub().resolves();
+      const TuyAPIStub = function TuyAPIStub() {
+        this.connect = connect;
+        this.get = get;
+        this.disconnect = disconnect;
+        attachEventHandlers(this);
+      };
+      const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+        tuyapi: TuyAPIStub,
+        '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
+      });
+      const promise = localPoll({
+        deviceId: 'device',
+        ip: '1.1.1.1',
+        localKey: 'key',
+        protocolVersion: '3.3',
+        timeoutMs: 10,
+      });
+      const errorPromise = (async () => {
+        try {
+          await promise;
+          return null;
+        } catch (error) {
+          return error;
+        }
+      })();
+      await clock.tickAsync(400);
+      expect(await Promise.race([errorPromise, Promise.resolve('pending')])).to.equal('pending');
+      await clock.tickAsync(100);
+      const error = await errorPromise;
+      expect(error).to.be.instanceOf(BadParameters);
+      expect(error.message).to.equal('Local poll timeout');
+    } finally {
+      clock.restore();
+    }
+  });
+
   it('should reject on socket error listener', async () => {
     const connect = sinon.stub().resolves();
     const get = sinon.stub().returns(new Promise(() => {}));
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index 6df2f6f05e..c7b7dc947a 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -375,4 +375,32 @@ describe('TuyaHandler.buildLocalScanResponse', () => {
     expect(response.devices[0].external_id).to.equal('tuya:device2');
     expect(response.local_devices).to.deep.equal({ device2: { ip: '2.2.2.2', version: '3.3', productKey: 'pkey' } });
   });
+
+  it('should persist local-only devices when discoveredDevices is not an array', () => {
+    const { buildLocalScanResponse } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
+      './device/tuya.convertDevice': {
+        convertDevice: sinon.stub().callsFake((device) => ({
+          external_id: `tuya:${device.id}`,
+          params: [{ name: 'IP_ADDRESS', value: device.ip }],
+        })),
+      },
+    });
+    const tuyaManager = {
+      discoveredDevices: null,
+      gladys: {
+        stateManager: {
+          get: sinon.stub().returns(null),
+        },
+      },
+    };
+
+    const response = buildLocalScanResponse(tuyaManager, {
+      devices: { device2: { ip: '2.2.2.2', version: '3.3', productKey: 'pkey' } },
+      portErrors: {},
+    });
+
+    expect(response.devices).to.have.length(1);
+    expect(tuyaManager.discoveredDevices).to.have.length(1);
+    expect(tuyaManager.discoveredDevices[0].external_id).to.equal('tuya:device2');
+  });
 });

From 47130ac0464c71419aaaa6f4984ed9a3dc5d7aa3 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 14:07:05 +0100
Subject: [PATCH 67/90] fix(tuya): harden mapping normalization and poll
 fallback

---
 server/services/tuya/lib/mappings/index.js    | 23 ++++++++++-------
 server/services/tuya/lib/tuya.poll.js         |  7 +++++-
 .../services/tuya/lib/mappings/index.test.js  |  9 +++++++
 .../test/services/tuya/lib/tuya.poll.test.js  | 25 +++++++++++++++++++
 4 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/server/services/tuya/lib/mappings/index.js b/server/services/tuya/lib/mappings/index.js
index 1b0c162071..47243fe183 100644
--- a/server/services/tuya/lib/mappings/index.js
+++ b/server/services/tuya/lib/mappings/index.js
@@ -41,7 +41,9 @@ const normalizeCode = (code) => {
   if (!code) {
     return null;
   }
-  return String(code).toLowerCase();
+  return String(code)
+    .trim()
+    .toLowerCase();
 };
 
 const normalizeStringSet = (setLike) =>
@@ -132,7 +134,7 @@ const extractCodesFromSpecifications = (specifications) => {
     if (!item || !item.code) {
       return;
     }
-    codes.add(String(item.code).toLowerCase());
+    codes.add(normalizeCode(item.code));
   });
 
   return codes;
@@ -150,9 +152,9 @@ const extractCodesFromFeatures = (features) => {
     }
     const parts = String(feature.external_id).split(':');
     if (parts.length >= 2) {
-      const code = parts[parts.length - 1];
+      const code = normalizeCode(parts[parts.length - 1]);
       if (code) {
-        codes.add(String(code).toLowerCase());
+        codes.add(code);
       }
     }
   });
@@ -170,7 +172,7 @@ const extractCodesFromThingModel = (thingModel) => {
       if (!property || !property.code) {
         return;
       }
-      codes.add(String(property.code).toLowerCase());
+      codes.add(normalizeCode(property.code));
     });
   });
 
@@ -179,15 +181,18 @@ const extractCodesFromThingModel = (thingModel) => {
 
 const extractCodesFromProperties = (propertiesPayload) => {
   const codes = new Set();
-  const properties = Array.isArray(propertiesPayload && propertiesPayload.properties)
-    ? propertiesPayload.properties
-    : [];
+  let properties = [];
+  if (Array.isArray(propertiesPayload)) {
+    properties = propertiesPayload;
+  } else if (Array.isArray(propertiesPayload && propertiesPayload.properties)) {
+    properties = propertiesPayload.properties;
+  }
 
   properties.forEach((property) => {
     if (!property || !property.code) {
       return;
     }
-    codes.add(String(property.code).toLowerCase());
+    codes.add(normalizeCode(property.code));
   });
 
   return codes;
diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index c89ce3cf88..886e88522a 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -303,7 +303,12 @@ async function poll(device) {
     }
   }
 
-  cloudSummary = await pollCloudFeatures.call(this, deviceFeatures, topic);
+  try {
+    cloudSummary = await pollCloudFeatures.call(this, deviceFeatures, topic);
+  } catch (e) {
+    logger.warn(`[Tuya][poll] cloud poll failed for ${topic}`, e);
+    fallbackReason = fallbackReason === 'none' ? 'cloud_poll_failed' : `${fallbackReason}+cloud_poll_failed`;
+  }
   logger.debug(
     `[Tuya][poll] device=${topic} mode=${modeUsed} local_handled=${localHandled} local_changed=${localChanged} cloud_handled=${cloudSummary.handled} cloud_changed=${cloudSummary.changed} cloud_missing=${cloudSummary.missing} fallback=${fallbackReason}`,
   );
diff --git a/server/test/services/tuya/lib/mappings/index.test.js b/server/test/services/tuya/lib/mappings/index.test.js
index 9bb7641974..a5583b41ff 100644
--- a/server/test/services/tuya/lib/mappings/index.test.js
+++ b/server/test/services/tuya/lib/mappings/index.test.js
@@ -21,6 +21,7 @@ describe('Tuya mappings index', () => {
   it('should normalize codes', () => {
     expect(normalizeCode()).to.equal(null);
     expect(normalizeCode('TeSt')).to.equal('test');
+    expect(normalizeCode(' switch_1 ')).to.equal('switch_1');
   });
 
   it('should extract codes from specifications and skip invalid entries', () => {
@@ -147,6 +148,14 @@ describe('Tuya mappings index', () => {
       model: 'Wifi Plug Mini',
     });
     expect(socketByMergedSources).to.equal(DEVICE_TYPES.SMART_SOCKET);
+
+    const socketByDirectPropertiesArray = getDeviceType({
+      specifications: {},
+      properties: [{}, { code: ' switch_1 ' }],
+      model: 'Wifi Plug Mini',
+      product_name: 'Plug',
+    });
+    expect(socketByDirectPropertiesArray).to.equal(DEVICE_TYPES.SMART_SOCKET);
   });
 
   it('should get feature mapping and ignore invalid candidates', () => {
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index 8b2163b5ee..74e6f4eb53 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -85,6 +85,31 @@ describe('TuyaHandler.poll', () => {
     }
   });
 
+  it('should return without throwing when final cloud poll fails', async () => {
+    tuyaHandler.connector.request = sinon.stub().rejects(new Error('cloud failed'));
+    const logger = {
+      debug: sinon.stub(),
+      warn: sinon.stub(),
+    };
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      '../../../utils/logger': logger,
+    });
+
+    await poll.call(tuyaHandler, {
+      external_id: 'tuya:device',
+      features: [
+        {
+          external_id: 'tuya:device:switch_1',
+          category: 'light',
+          type: 'binary',
+        },
+      ],
+    });
+
+    assert.callCount(logger.warn, 1);
+    expect(logger.warn.firstCall.args[0]).to.include('cloud poll failed');
+    assert.callCount(gladys.event.emit, 0);
+  });
   it('should skip cloud feature when code is missing from payload', async () => {
     await tuyaHandler.poll({
       external_id: 'tuya:device',

From ae8b01bc2161860a6c3956d80ab6bcf678480374 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 14:26:51 +0100
Subject: [PATCH 68/90] fix(tuya): harden fixture tests and device diagnostics

---
 front/src/config/i18n/en.json                 |  2 +-
 front/src/config/i18n/fr.json                 |  4 +--
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 25 +++++++++++++++----
 .../services/tuya/fixtures/fixtureHelper.js   |  1 +
 .../device/feature/tuya.deviceMapping.test.js |  6 +++--
 .../tuya.convertDevice.fixtures.test.js       |  4 +++
 .../device/tuya.localMapping.fixtures.test.js |  8 ++++++
 .../test/services/tuya/lib/tuya.poll.test.js  |  1 +
 8 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index eb08b06584..efdd171f24 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1138,7 +1138,7 @@
       "discover": {
         "title": "Devices detected on your Tuya cloud account",
         "description": "Tuya devices are automatically discovered. Your Tuya devices need to be added to your Tuya cloud account before.",
-        "localDiscoveryInfo": "<strong class=\"h5 d-block\">Cloud Scan</strong>Refreshes the cloud list. Make sure your devices are set as <strong>controllable</strong> in Tuya, otherwise they stay <strong>read-only</strong>. The cloud trial is limited to <strong>10 controllable devices</strong>; additional devices may only provide <strong>state updates</strong>.<br /><br /><strong class=\"h5 d-block\">Auto local scan</strong>Runs a scan on your local network (UDP broadcast, same subnet as Gladys). If a device is not found, fill in its <strong>local IP</strong> and <strong>protocol version</strong> (or leave empty if unknown), then use \"<strong>Poll local DPS</strong>\" to validate local communication.<br /><br />Use <strong>Save</strong> to create a device and <strong>Update</strong> to apply changes or switch the device to local mode.",
+        "localDiscoveryInfo": "<strong class=\"h5 d-block\">Cloud Scan</strong> Refreshes the cloud list. Make sure your devices are set as <strong>controllable</strong> in Tuya, otherwise they stay <strong>read-only</strong>. The cloud trial is limited to <strong>10 controllable devices</strong>; additional devices may only provide <strong>state updates</strong>.<br /><br /><strong class=\"h5 d-block\">Auto local scan</strong> Runs a scan on your local network (UDP broadcast, same subnet as Gladys). If a device is not found, fill in its <strong>local IP</strong> and <strong>protocol version</strong> (or leave empty if unknown), then use \"<strong>Poll local DPS</strong>\" to validate local communication.<br /><br />Use <strong>Save</strong> to create a device and <strong>Update</strong> to apply changes or switch the device to local mode.",
         "scanCloudInProgress": "Scan in progress... retrieving cloud devices. This can take a while.",
         "scanLocalInProgressConnected": "Scan in progress... retrieving local information for devices. This can take a while.",
         "scanLocalInProgressDisconnected": "Scan in progress... retrieving local devices. This can take a while.",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index d5f8b884f5..f586be943f 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1353,7 +1353,7 @@
         "localInfoHelp": "Utilisez le bouton Cloud/Local pour choisir le mode de communication. Le mode local permet de modifier l'IP locale. Le mode cloud affiche l'IP cloud (lecture seule).",
         "localPollButton": "Lecture locale des DP",
         "localPollInProgress": "Lecture locale en cours... protocole {{protocol}}.",
-        "localPollHelp": "Si vous connaissez le protocole, sélectionnez-le puis cliquez pour vérifier. Sinon, cliquez directement pour un scan complet (plus long).",
+        "localPollHelp": "Si vous connaissez le protocole, sélectionnez-le puis cliquez pour vérifier. Sinon, cliquez directement pour une analyse complète (plus longue).",
         "localPollRequired": "Le mode local est activé et les paramètres locaux ont changé. Lancez une lecture locale des DP avec succès avant de sauvegarder. Si vous n'arrivez pas à faire fonctionner le local, repassez en mode cloud.",
         "localPollSuccess": "Lecture locale OK.",
         "localPollError": "Échec de la lecture locale :",
@@ -1373,7 +1373,7 @@
       "discover": {
         "title": "Appareils détectés sur votre compte cloud Tuya",
         "description": "Les appareils Tuya sont automatiquement découverts. Vos appareils Tuya doivent être ajoutés à votre compte cloud Tuya avant.",
-        "localDiscoveryInfo": "<strong class=\"h5 d-block\">Scan Cloud</strong>Rafraîchit la liste cloud. Assurez-vous que vos appareils sont en mode <strong>contrôlable</strong> dans Tuya, sinon ils resteront en <strong>lecture seule</strong>. La période d'essai est limitée à <strong>10 appareils contrôlables</strong> : les autres n'auront que le <strong>retour d'état</strong>.<br /><br /><strong class=\"h5 d-block\">Scan local auto</strong>Lance un scan sur votre réseau local (broadcast UDP, même plage IP que Gladys). Si un appareil n'est pas trouvé, renseignez l'<strong>IP locale</strong> et la <strong>version du protocole</strong> (ou laissez vide si vous ne la connaissez pas), puis utilisez \"<strong>Lecture locale des DP</strong>\" pour valider la communication locale.<br /><br />Utilisez <strong>Sauvegarder</strong> pour créer un appareil et <strong>Mettre à jour</strong> pour appliquer des changements ou passer l'appareil en local.",
+        "localDiscoveryInfo": "<strong class=\"h5 d-block\">Scan Cloud</strong> Rafraîchit la liste cloud. Assurez-vous que vos appareils sont en mode <strong>contrôlable</strong> dans Tuya, sinon ils resteront en <strong>lecture seule</strong>. La période d'essai est limitée à <strong>10 appareils contrôlables</strong> : les autres n'auront que le <strong>retour d'état</strong>.<br /><br /><strong class=\"h5 d-block\">Scan local auto</strong> Lance un scan sur votre réseau local (broadcast UDP, même plage IP que Gladys). Si un appareil n'est pas trouvé, renseignez l'<strong>IP locale</strong> et la <strong>version du protocole</strong> (ou laissez vide si vous ne la connaissez pas), puis utilisez \"<strong>Lecture locale des DP</strong>\" pour valider la communication locale.<br /><br />Utilisez <strong>Sauvegarder</strong> pour créer un appareil et <strong>Mettre à jour</strong> pour appliquer des changements ou passer l'appareil en local.",
         "scanCloudInProgress": "Scan en cours... récupération cloud des appareils. Cela peut prendre un moment.",
         "scanLocalInProgressConnected": "Scan en cours... récupération des informations locales des appareils. Cela peut prendre un moment.",
         "scanLocalInProgressDisconnected": "Scan en cours... récupération des appareils en local. Cela peut prendre un moment.",
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 6e18145e0a..c93e14000f 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -131,15 +131,30 @@ const getUnknownSpecificationCodes = (specifications, features, device) => {
     return [];
   }
   const knownCodes = new Set();
+  const addKnownCode = code => {
+    if (code !== null && code !== undefined) {
+      knownCodes.add(String(code).trim().toLowerCase());
+    }
+  };
   if (Array.isArray(features)) {
     features.forEach(feature => {
       const parts = (feature.external_id || '').split(':');
-      const code = parts.length >= 3 ? parts[2] : null;
-      if (code) {
-        knownCodes.add(code.toLowerCase());
-      }
+      const code = parts.length >= 2 ? parts[parts.length - 1] : null;
+      addKnownCode(code);
     });
   }
+  const services = Array.isArray(device && device.thing_model && device.thing_model.services) ? device.thing_model.services : [];
+  services.forEach(service => {
+    const properties = Array.isArray(service && service.properties) ? service.properties : [];
+    properties.forEach(property => addKnownCode(property && property.code));
+  });
+  const propertiesPayload = device && device.properties;
+  const properties = Array.isArray(propertiesPayload)
+    ? propertiesPayload
+    : Array.isArray(propertiesPayload && propertiesPayload.properties)
+    ? propertiesPayload.properties
+    : [];
+  properties.forEach(property => addKnownCode(property && property.code));
   const specCodes = new Set();
   ['functions', 'status'].forEach(key => {
     const entries = specifications[key];
@@ -154,7 +169,7 @@ const getUnknownSpecificationCodes = (specifications, features, device) => {
   });
   const ignoredCodes = getIgnoredCloudCodes(device);
   return Array.from(specCodes).filter(code => {
-    const normalized = code.toLowerCase();
+    const normalized = String(code).trim().toLowerCase();
     return !knownCodes.has(normalized) && !ignoredCodes.has(normalized);
   });
 };
diff --git a/server/test/services/tuya/fixtures/fixtureHelper.js b/server/test/services/tuya/fixtures/fixtureHelper.js
index 7fea184092..b3332b7002 100644
--- a/server/test/services/tuya/fixtures/fixtureHelper.js
+++ b/server/test/services/tuya/fixtures/fixtureHelper.js
@@ -94,6 +94,7 @@ const loadFixtureCases = (sectionName) =>
   fs
     .readdirSync(FIXTURES_ROOT)
     .sort()
+    .filter((directoryName) => fs.statSync(path.join(FIXTURES_ROOT, directoryName)).isDirectory())
     .map((directoryName) => {
       const fixtureDirectory = path.join(FIXTURES_ROOT, directoryName);
       const manifest = fixtureRequire(path.join(fixtureDirectory, 'manifest.js'));
diff --git a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
index ff4d1246e7..7cbfdf96ec 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
@@ -136,8 +136,10 @@ describe('Tuya device mapping', () => {
       });
     });
     describe('energy sensor', () => {
-      it('switch power invalid value returns NaN', () => {
-        const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.POWER]('not-a-number');
+      it('energy sensor power invalid value returns NaN', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][DEVICE_FEATURE_TYPES.ENERGY_SENSOR.POWER](
+          'not-a-number',
+        );
         expect(Number.isNaN(result)).to.equal(true);
       });
       it('power with scale', () => {
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js
index 2a1dfef087..b8e55e5829 100644
--- a/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js
@@ -6,6 +6,10 @@ const { loadFixtureCases, normalizeConvertedDevice, sortByKey } = require('../..
 describe('tuya.convertDevice fixtures', () => {
   const fixtureCases = loadFixtureCases('convertDevice');
 
+  it('should load at least one convertDevice fixture case', () => {
+    expect(fixtureCases.length).to.be.greaterThan(0);
+  });
+
   fixtureCases.forEach((fixtureCase) => {
     it(`should convert ${fixtureCase.manifest.name} from fixture`, () => {
       const { input, expected } = fixtureCase.manifest.convertDevice;
diff --git a/server/test/services/tuya/lib/device/tuya.localMapping.fixtures.test.js b/server/test/services/tuya/lib/device/tuya.localMapping.fixtures.test.js
index 8994b1cb49..f79bbb4798 100644
--- a/server/test/services/tuya/lib/device/tuya.localMapping.fixtures.test.js
+++ b/server/test/services/tuya/lib/device/tuya.localMapping.fixtures.test.js
@@ -6,6 +6,10 @@ const { loadFixtureCases, sortByKey } = require('../../fixtures/fixtureHelper');
 describe('Tuya local mapping fixtures', () => {
   const fixtureCases = loadFixtureCases('localMapping');
 
+  it('should load at least one local mapping fixture case', () => {
+    expect(fixtureCases.length).to.be.greaterThan(0);
+  });
+
   fixtureCases.forEach((fixtureCase) => {
     it(`should resolve local dps for ${fixtureCase.manifest.name} from fixture`, () => {
       const { device, expected } = fixtureCase.manifest.localMapping;
@@ -13,9 +17,13 @@ describe('Tuya local mapping fixtures', () => {
       const expectedMapping = fixtureCase.load(expected);
 
       const resolvedMapping = currentDevice.features.reduce((accumulator, feature) => {
+        expect(feature.external_id).to.be.a('string');
         const code = String(feature.external_id)
           .split(':')
           .pop();
+        expect(code)
+          .to.be.a('string')
+          .and.not.equal('');
         accumulator[code] = getLocalDpsFromCode(code, currentDevice);
         return accumulator;
       }, {});
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index 74e6f4eb53..e87af3e0b4 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -12,6 +12,7 @@ const TuyaHandler = proxyquire('../../../../services/tuya/lib/index', {
   './tuya.connect.js': connect,
 });
 const { EVENTS } = require('../../../../utils/constants');
+const { API } = require('../../../../services/tuya/lib/utils/tuya.constants');
 
 const { BadParameters } = require('../../../../utils/coreErrors');
 

From b88e723c01fc06544c6027ccd2841a818612c12d Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 14:32:06 +0100
Subject: [PATCH 69/90] style(tuya): apply frontend formatting on device box

---
 .../routes/integration/all/tuya/TuyaDeviceBox.jsx  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index c93e14000f..a391bf4373 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -133,7 +133,11 @@ const getUnknownSpecificationCodes = (specifications, features, device) => {
   const knownCodes = new Set();
   const addKnownCode = code => {
     if (code !== null && code !== undefined) {
-      knownCodes.add(String(code).trim().toLowerCase());
+      knownCodes.add(
+        String(code)
+          .trim()
+          .toLowerCase()
+      );
     }
   };
   if (Array.isArray(features)) {
@@ -143,7 +147,9 @@ const getUnknownSpecificationCodes = (specifications, features, device) => {
       addKnownCode(code);
     });
   }
-  const services = Array.isArray(device && device.thing_model && device.thing_model.services) ? device.thing_model.services : [];
+  const services = Array.isArray(device && device.thing_model && device.thing_model.services)
+    ? device.thing_model.services
+    : [];
   services.forEach(service => {
     const properties = Array.isArray(service && service.properties) ? service.properties : [];
     properties.forEach(property => addKnownCode(property && property.code));
@@ -169,7 +175,9 @@ const getUnknownSpecificationCodes = (specifications, features, device) => {
   });
   const ignoredCodes = getIgnoredCloudCodes(device);
   return Array.from(specCodes).filter(code => {
-    const normalized = String(code).trim().toLowerCase();
+    const normalized = String(code)
+      .trim()
+      .toLowerCase();
     return !knownCodes.has(normalized) && !ignoredCodes.has(normalized);
   });
 };

From dc58f5cbd5ef1be612016ca9fbffc56a855618d0 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 15:46:39 +0100
Subject: [PATCH 70/90] fix(tuya): open github issue popup before async check

---
 .../routes/integration/all/tuya/TuyaDeviceBox.jsx   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index a391bf4373..820e251fcd 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -820,12 +820,19 @@ class TuyaDeviceBox extends Component {
       return;
     }
     const issueTitle = buildIssueTitle(device);
+    const popup = window.open('about:blank', '_blank');
+    if (popup) {
+      popup.opener = null;
+    }
     this.setState({ githubIssueChecking: true });
     let shouldOpenIssue = true;
     try {
       const exists = await checkGithubIssueExists(issueTitle);
       if (exists) {
         shouldOpenIssue = false;
+        if (popup && !popup.closed) {
+          popup.close();
+        }
         this.setState({ githubIssueExists: true });
       }
     } catch (error) {
@@ -837,7 +844,11 @@ class TuyaDeviceBox extends Component {
       return;
     }
     const title = encodeURIComponent(issueTitle);
-    window.open(`${GITHUB_BASE_URL}?title=${title}`, '_blank');
+    if (popup && !popup.closed) {
+      popup.location.href = `${GITHUB_BASE_URL}?title=${title}`;
+    } else {
+      window.open(`${GITHUB_BASE_URL}?title=${title}`, '_blank');
+    }
     this.setState({ githubIssueOpened: true });
   };
 

From fd11ac126a437873ed3de96abee6a2e103b17e25 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 15:53:59 +0100
Subject: [PATCH 71/90] fix(tuya): harden setup status and local scan follow-up

---
 .../all/tuya/setup-page/SetupTab.jsx          |  5 +-
 .../tuya/lib/tuya.loadDeviceDetails.js        |  9 +--
 server/services/tuya/lib/tuya.localScan.js    |  7 +-
 .../tuya/lib/tuya.loadDeviceDetails.test.js   | 22 ++++++
 .../services/tuya/lib/tuya.localScan.test.js  | 69 +++++++++++++++++++
 5 files changed, 104 insertions(+), 8 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
index 5f788bb18c..15524a8cf2 100644
--- a/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
+++ b/front/src/routes/integration/all/tuya/setup-page/SetupTab.jsx
@@ -126,7 +126,10 @@ class SetupTab extends Component {
       });
     } catch (e) {
       this.setState({
-        tuyaStatusLoading: false
+        tuyaStatusLoading: false,
+        tuyaConnectionStatus: RequestStatus.Error,
+        tuyaConnectionError:
+          (e && e.response && e.response.data && e.response.data.message) || e.message || 'Status fetch failed'
       });
     }
   }
diff --git a/server/services/tuya/lib/tuya.loadDeviceDetails.js b/server/services/tuya/lib/tuya.loadDeviceDetails.js
index 3404cd4da9..4d5c059e05 100644
--- a/server/services/tuya/lib/tuya.loadDeviceDetails.js
+++ b/server/services/tuya/lib/tuya.loadDeviceDetails.js
@@ -49,10 +49,11 @@ async function loadDeviceDetails(tuyaDevice) {
     logger.warn(`[Tuya] Failed to load thing model for ${deviceId}: ${reason}`);
   }
 
-  const specifications = specResult.status === 'fulfilled' ? specResult.value.result || {} : {};
-  const details = detailsResult.status === 'fulfilled' ? detailsResult.value.result || {} : {};
-  const properties = propsResult.status === 'fulfilled' ? propsResult.value.result || {} : {};
-  const modelPayload = modelResult.status === 'fulfilled' ? modelResult.value.result || null : null;
+  const specifications = specResult.status === 'fulfilled' ? (specResult.value && specResult.value.result) || {} : {};
+  const details = detailsResult.status === 'fulfilled' ? (detailsResult.value && detailsResult.value.result) || {} : {};
+  const properties = propsResult.status === 'fulfilled' ? (propsResult.value && propsResult.value.result) || {} : {};
+  const modelPayload =
+    modelResult.status === 'fulfilled' ? (modelResult.value && modelResult.value.result) || null : null;
   const rawModel =
     modelPayload && Object.prototype.hasOwnProperty.call(modelPayload, 'model') ? modelPayload.model : modelPayload;
   let thingModel = null;
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index 6ad1e686f1..8364975e12 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -83,10 +83,11 @@ async function localScan(input = 10) {
     }
 
     const isNew = !devices[deviceId];
+    const previous = devices[deviceId] || {};
     devices[deviceId] = {
-      ip: resolvedIp,
-      version,
-      productKey,
+      ip: resolvedIp || previous.ip,
+      version: version || previous.version,
+      productKey: productKey || previous.productKey,
     };
     if (isNew) {
       logger.info(`[Tuya][localScan] Found device ${deviceId} ip=${ip || 'unknown'} version=${version || 'unknown'}`);
diff --git a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
index 5b6e282621..d3a41b0c91 100644
--- a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
@@ -206,4 +206,26 @@ describe('TuyaHandler.loadDeviceDetails', () => {
       thing_model: { services: [] },
     });
   });
+
+  it('should handle fulfilled responses with null values', async () => {
+    tuyaHandler.connector.request = sinon
+      .stub()
+      .onCall(0)
+      .resolves(null)
+      .onCall(1)
+      .resolves(null)
+      .onCall(2)
+      .resolves(null)
+      .onCall(3)
+      .resolves(null);
+
+    const device = await tuyaHandler.loadDeviceDetails({ id: 1 });
+
+    expect(device).to.deep.eq({
+      id: 1,
+      specifications: {},
+      properties: {},
+      thing_model: null,
+    });
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index c7b7dc947a..0f0603083e 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -145,6 +145,75 @@ describe('TuyaHandler.localScan', () => {
     });
   });
 
+  it('should preserve richer fields when duplicate device packets are sparse', async () => {
+    const sockets = [];
+    const dgramStub = {
+      createSocket: () => {
+        const handlers = {};
+        const socket = {
+          on: (event, cb) => {
+            handlers[event] = cb;
+          },
+          bind: (options, cb) => {
+            if (typeof options === 'function') {
+              options();
+              return;
+            }
+            if (cb) {
+              cb();
+            }
+          },
+          close: () => {},
+          handlers,
+        };
+        sockets.push(socket);
+        return socket;
+      },
+    };
+
+    let callIndex = 0;
+    class MessageParserStub {
+      parse() {
+        callIndex += 1;
+        if (callIndex === 1) {
+          return [{ payload: { gwId: 'device-id', ip: '1.1.1.1', version: '3.3', productKey: 'product-key' } }];
+        }
+        return [{ payload: { gwId: 'device-id' } }];
+      }
+    }
+
+    const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
+      dgram: dgramStub,
+      '@demirdeniz/tuyapi-newgen/lib/message-parser': { MessageParser: MessageParserStub },
+      '@demirdeniz/tuyapi-newgen/lib/config': { UDP_KEY: 'key' },
+    });
+
+    const clock = sinon.useFakeTimers();
+    const promise = localScan(1);
+
+    sockets.forEach((socket) => {
+      if (socket.handlers.message) {
+        socket.handlers.message(Buffer.from('first'));
+        socket.handlers.message(Buffer.from('second'));
+      }
+    });
+
+    await clock.tickAsync(1100);
+    const result = await promise;
+    clock.restore();
+
+    expect(result).to.deep.equal({
+      devices: {
+        'device-id': {
+          ip: '1.1.1.1',
+          version: '3.3',
+          productKey: 'product-key',
+        },
+      },
+      portErrors: {},
+    });
+  });
+
   it('should skip message when all parsers fail', async () => {
     const sockets = [];
     const dgramStub = {

From d4479c54c01df53e02c32985286f61b178eb1763 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 17:07:47 +0100
Subject: [PATCH 72/90] fix(tuya): apply follow-up hardening adjustments

---
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 45 ++++++++++++-------
 .../all/tuya/discover-page/DiscoverTab.jsx    |  9 ++--
 .../tuya/lib/mappings/cloud/smart-meter.js    |  4 ++
 server/services/tuya/lib/tuya.connect.js      |  5 +++
 server/services/tuya/lib/tuya.loadDevices.js  |  7 ++-
 .../services/tuya/lib/tuya.connect.test.js    | 32 +++++++++++++
 .../tuya/lib/tuya.loadDevices.test.js         | 10 +++++
 .../tuya/lib/tuya.setValue.fixtures.test.js   |  4 ++
 8 files changed, 97 insertions(+), 19 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 820e251fcd..3b164c43bb 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -6,9 +6,8 @@ import get from 'get-value';
 import DeviceFeatures from '../../../../components/device/view/DeviceFeatures';
 import { connect } from 'unistore/preact';
 import { RequestStatus } from '../../../../utils/consts';
+import { normalizeBoolean } from '../../../../../../server/services/tuya/lib/utils/tuya.normalize';
 
-const normalizeBoolean = value =>
-  value === true || value === 1 || value === '1' || value === 'true' || value === 'TRUE';
 const ONLINE_RECENT_MINUTES = 5;
 const LOCAL_POLL_FREQUENCY = 10 * 1000;
 const CLOUD_POLL_FREQUENCY = 30 * 1000;
@@ -638,19 +637,35 @@ class TuyaDeviceBox extends Component {
           newParams.push({ name: 'PROTOCOL_VERSION', value: usedProtocol });
         }
       }
-      this.setState({
-        device: {
-          ...baseDevice,
-          params: newParams
-        },
-        localPollStatus: RequestStatus.Success,
-        localPollProtocol: null,
-        localPollValidation: {
-          ip: getParam('IP_ADDRESS') || currentDevice.ip || '',
-          protocol: usedProtocol || '',
-          localOverride: true
-        },
-        localPollDps: result ? result.dps : null
+      this.setState(prevState => {
+        const latestStateDevice = prevState.device || {};
+        const latestStateParams = Array.isArray(latestStateDevice.params) ? latestStateDevice.params : [];
+        const mergedParams = [...newParams];
+
+        latestStateParams.forEach(param => {
+          const index = mergedParams.findIndex(baseParam => baseParam.name === param.name);
+          if (index >= 0) {
+            mergedParams[index] = { ...mergedParams[index], ...param };
+          } else {
+            mergedParams.push(param);
+          }
+        });
+
+        return {
+          device: {
+            ...baseDevice,
+            ...latestStateDevice,
+            params: mergedParams
+          },
+          localPollStatus: RequestStatus.Success,
+          localPollProtocol: null,
+          localPollValidation: {
+            ip: getParam('IP_ADDRESS') || currentDevice.ip || '',
+            protocol: usedProtocol || '',
+            localOverride: true
+          },
+          localPollDps: result ? result.dps : null
+        };
       });
     } catch (e) {
       const message =
diff --git a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
index 9b11ca22cb..cf5b17bf7b 100644
--- a/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
+++ b/front/src/routes/integration/all/tuya/discover-page/DiscoverTab.jsx
@@ -10,6 +10,9 @@ import { Component } from 'preact';
 import { RequestStatus } from '../../../../../utils/consts';
 
 const getDeviceRank = device => {
+  if (!device || typeof device !== 'object') {
+    return 4;
+  }
   const isCreated = !!device.created_at;
   const hasFeatures = device.features && device.features.length > 0;
   const isUpdatable = !!device.updatable;
@@ -34,8 +37,8 @@ const sortDevices = devices =>
     if (rankDiff !== 0) {
       return rankDiff;
     }
-    const nameA = (a.name || '').toLowerCase();
-    const nameB = (b.name || '').toLowerCase();
+    const nameA = ((a && a.name) || '').toLowerCase();
+    const nameB = ((b && b.name) || '').toLowerCase();
     if (nameA < nameB) {
       return -1;
     }
@@ -100,7 +103,7 @@ class DiscoverTab extends Component {
       const response = await this.props.httpClient.post('/api/v1/service/tuya/local-scan', {
         timeoutSeconds: 10
       });
-      if (response && response.devices) {
+      if (response && Array.isArray(response.devices) && response.devices.length > 0) {
         this.setState({
           discoveredDevices: response.devices
         });
diff --git a/server/services/tuya/lib/mappings/cloud/smart-meter.js b/server/services/tuya/lib/mappings/cloud/smart-meter.js
index 164a512bd8..e3fef93816 100644
--- a/server/services/tuya/lib/mappings/cloud/smart-meter.js
+++ b/server/services/tuya/lib/mappings/cloud/smart-meter.js
@@ -57,11 +57,13 @@ module.exports = {
     unit: DEVICE_FEATURE_UNITS.MILLI_AMPERE,
   },
   energy_forword_a: {
+    // Intentional: matches Tuya device API code.
     category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
     type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.ENERGY,
     unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
   },
   energy_forword_b: {
+    // Intentional: matches Tuya device API code.
     category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
     type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.ENERGY,
     unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
@@ -72,11 +74,13 @@ module.exports = {
     unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
   },
   energy_reverse_a: {
+    // Intentional: matches Tuya device API code.
     category: DEVICE_FEATURE_CATEGORIES.ENERGY_PRODUCTION_SENSOR,
     type: DEVICE_FEATURE_TYPES.ENERGY_PRODUCTION_SENSOR.INDEX,
     unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
   },
   energy_reserse_b: {
+    // Intentional: matches Tuya device API code.
     category: DEVICE_FEATURE_CATEGORIES.ENERGY_PRODUCTION_SENSOR,
     type: DEVICE_FEATURE_TYPES.ENERGY_PRODUCTION_SENSOR.INDEX,
     unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
diff --git a/server/services/tuya/lib/tuya.connect.js b/server/services/tuya/lib/tuya.connect.js
index 9c4dc8cce7..9fc103544d 100644
--- a/server/services/tuya/lib/tuya.connect.js
+++ b/server/services/tuya/lib/tuya.connect.js
@@ -65,6 +65,11 @@ const validateAppAccount = async (connector, appAccountId) => {
       page_size: 1,
     },
   });
+  if (!response) {
+    const error = new Error('TUYA_APP_ACCOUNT_UID_INVALID');
+    error.code = 'TUYA_APP_ACCOUNT_UID_INVALID';
+    throw error;
+  }
   if (response && response.success === false) {
     const error = new Error(response.msg || response.message || 'TUYA_APP_ACCOUNT_UID_INVALID');
     error.code = response.code || 'TUYA_APP_ACCOUNT_UID_INVALID';
diff --git a/server/services/tuya/lib/tuya.loadDevices.js b/server/services/tuya/lib/tuya.loadDevices.js
index 9f7550e5c5..2b14aed438 100644
--- a/server/services/tuya/lib/tuya.loadDevices.js
+++ b/server/services/tuya/lib/tuya.loadDevices.js
@@ -38,7 +38,12 @@ async function loadDevices(pageNo = 1, pageSize = 100) {
   }
 
   const result = responsePage.result || [];
-  const list = Array.isArray(result) ? result : result.list || [];
+  let list = [];
+  if (Array.isArray(result)) {
+    list = result;
+  } else if (Array.isArray(result && result.list)) {
+    list = result.list;
+  }
   let hasMore = list.length === pageSize;
   if (!Array.isArray(result) && typeof result.has_more === 'boolean') {
     hasMore = result.has_more;
diff --git a/server/test/services/tuya/lib/tuya.connect.test.js b/server/test/services/tuya/lib/tuya.connect.test.js
index f124615ce3..12b2a16e56 100644
--- a/server/test/services/tuya/lib/tuya.connect.test.js
+++ b/server/test/services/tuya/lib/tuya.connect.test.js
@@ -252,4 +252,36 @@ describe('TuyaHandler.connect', () => {
     expect(handler.autoReconnectAllowed).to.equal(false);
     assert.calledOnce(requestStub);
   });
+
+  it('should map invalid app account uid from empty api response', async () => {
+    const clientStub = {
+      init: sinon.stub().resolves(),
+    };
+    const requestStub = sinon.stub().resolves(null);
+    const TuyaContextStub = function TuyaContextStub() {
+      this.client = clientStub;
+      this.request = requestStub;
+    };
+
+    const connectWithStub = proxyquire('../../../../services/tuya/lib/tuya.connect', {
+      '@tuya/tuya-connector-nodejs': { TuyaContext: TuyaContextStub },
+    });
+    const TuyaHandlerWithStub = proxyquire('../../../../services/tuya/lib/index', {
+      './tuya.connect.js': connectWithStub,
+    });
+    const handler = new TuyaHandlerWithStub(gladys, serviceId);
+    handler.autoReconnectAllowed = true;
+
+    await handler.connect({
+      baseUrl: 'apiUrl',
+      accessKey: 'accessKey',
+      secretKey: 'secretKey',
+      appAccountId: 'appAccountId',
+    });
+
+    expect(handler.status).to.eq(STATUS.ERROR);
+    expect(handler.lastError).to.eq('integration.tuya.setup.errorInvalidAppAccountUid');
+    expect(handler.autoReconnectAllowed).to.equal(false);
+    assert.calledOnce(requestStub);
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.loadDevices.test.js b/server/test/services/tuya/lib/tuya.loadDevices.test.js
index 80d9c15d27..4219823287 100644
--- a/server/test/services/tuya/lib/tuya.loadDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDevices.test.js
@@ -131,4 +131,14 @@ describe('TuyaHandler.loadDevices', () => {
       expect(e.message).to.equal('Tuya API pagination did not advance (has_more=true with empty page)');
     }
   });
+
+  it('should handle malformed result.list payloads as empty pages', async () => {
+    tuyaHandler.connector.request = sinon.stub().resolves({
+      result: { list: { id: 1 }, has_more: false },
+    });
+
+    const devices = await tuyaHandler.loadDevices(1, 1);
+
+    expect(devices).to.deep.eq([]);
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js b/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js
index f23a61fed9..b65a965788 100644
--- a/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js
@@ -9,6 +9,10 @@ const { loadFixtureCases } = require('../fixtures/fixtureHelper');
 describe('TuyaHandler.setValue fixtures', () => {
   const fixtureCases = loadFixtureCases('setValueLocal');
 
+  it('should load at least one setValue fixture case', () => {
+    expect(fixtureCases.length).to.be.greaterThan(0);
+  });
+
   fixtureCases.forEach((fixtureCase) => {
     it(`should set local value for ${fixtureCase.manifest.name} from fixture`, async () => {
       const connect = sinon.stub().resolves();

From fa06ada571707561528e5f77edb01b1548fd5b75 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 19:53:21 +0100
Subject: [PATCH 73/90] feat(tuya): improve unsupported device issue reports

---
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 353 +-----------
 .../all/tuya/commons/deviceHelpers.js         | 160 ++++++
 .../all/tuya/commons/githubIssue.js           | 525 ++++++++++++++++++
 .../tuya/lib/device/tuya.convertDevice.js     |   5 +
 .../tuya/lib/tuya.loadDeviceDetails.js        |  17 +-
 server/services/tuya/lib/tuya.localScan.js    |   2 +
 .../tuya/lib/utils/tuya.deviceParams.js       |   3 +-
 server/services/tuya/lib/utils/tuya.report.js | 162 ++++++
 .../tuya/lib/tuya.discoverDevices.test.js     | 116 +++-
 .../tuya/lib/tuya.loadDeviceDetails.test.js   | 139 +++++
 .../services/tuya/lib/tuya.localPoll.test.js  |  27 +
 .../services/tuya/lib/tuya.localScan.test.js  |  34 ++
 12 files changed, 1211 insertions(+), 332 deletions(-)
 create mode 100644 front/src/routes/integration/all/tuya/commons/deviceHelpers.js
 create mode 100644 front/src/routes/integration/all/tuya/commons/githubIssue.js
 create mode 100644 server/services/tuya/lib/utils/tuya.report.js

diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 3b164c43bb..a9711711f1 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -6,180 +6,25 @@ import get from 'get-value';
 import DeviceFeatures from '../../../../components/device/view/DeviceFeatures';
 import { connect } from 'unistore/preact';
 import { RequestStatus } from '../../../../utils/consts';
-import { normalizeBoolean } from '../../../../../../server/services/tuya/lib/utils/tuya.normalize';
+import {
+  normalizeBoolean,
+  buildParamsMap,
+  getLocalPollDpsFromParams,
+  getUnknownDpsKeys,
+  getUnknownSpecificationCodes
+} from './commons/deviceHelpers';
+import {
+  buildIssueTitle,
+  buildGithubSearchUrl,
+  checkGithubIssueExists,
+  createGithubIssueData,
+  createGithubUrl,
+  createEmptyGithubIssueUrl
+} from './commons/githubIssue';
 
 const ONLINE_RECENT_MINUTES = 5;
 const LOCAL_POLL_FREQUENCY = 10 * 1000;
 const CLOUD_POLL_FREQUENCY = 30 * 1000;
-const GITHUB_BASE_URL = 'https://github.com/GladysAssistant/Gladys/issues/new';
-const GITHUB_SEARCH_BASE_URL = 'https://github.com/GladysAssistant/Gladys/issues?q=';
-const GITHUB_SEARCH_API_URL = 'https://api.github.com/search/issues?q=';
-const GITHUB_SEARCH_CACHE_TTL_MS = 1000 * 60 * 5;
-const MAX_GITHUB_CACHE_SIZE = 100;
-const MAX_GITHUB_URL_LENGTH = 8000;
-const githubIssueCache = new Map();
-
-const maskIp = ip => {
-  if (!ip || typeof ip !== 'string') {
-    return null;
-  }
-  const parts = ip.split('.');
-  if (parts.length !== 4 || parts.some(part => part === '' || Number.isNaN(parseInt(part, 10)))) {
-    return null;
-  }
-  return `${parts[0]}.x.x.x`;
-};
-
-const sanitizeParams = params => {
-  if (!Array.isArray(params)) {
-    return [];
-  }
-  return params.map(param => {
-    if (param.name === 'LOCAL_KEY') {
-      return { ...param, value: '***' };
-    }
-    if (param.name === 'IP_ADDRESS' || param.name === 'CLOUD_IP') {
-      return { ...param, value: maskIp(param.value) };
-    }
-    return param;
-  });
-};
-
-const getIgnoredLocalDps = device => {
-  const mapping = device && device.tuya_mapping ? device.tuya_mapping : null;
-  const ignored = mapping && Array.isArray(mapping.ignored_local_dps) ? mapping.ignored_local_dps : [];
-  return new Set(ignored.map(value => String(value)));
-};
-
-const getIgnoredCloudCodes = device => {
-  const mapping = device && device.tuya_mapping ? device.tuya_mapping : null;
-  const ignored = mapping && Array.isArray(mapping.ignored_cloud_codes) ? mapping.ignored_cloud_codes : [];
-  return new Set(ignored.map(value => String(value).toLowerCase()));
-};
-
-const LOCAL_CODE_ALIASES = {
-  switch: ['power'],
-  power: ['switch']
-};
-
-const getLocalDpsFromProperties = (code, properties) => {
-  if (!code || !properties) {
-    return null;
-  }
-  const list = Array.isArray(properties.properties) ? properties.properties : properties;
-  if (!Array.isArray(list)) {
-    return null;
-  }
-  const normalized = code.toLowerCase();
-  const candidates = [normalized, ...(LOCAL_CODE_ALIASES[normalized] || [])];
-  for (const candidate of candidates) {
-    const match = list.find(item => item && item.code && item.code.toLowerCase() === candidate);
-    if (match && match.dp_id !== undefined && match.dp_id !== null) {
-      return match.dp_id;
-    }
-  }
-  return null;
-};
-
-const getLocalDpsFromCode = (code, device) => {
-  if (!code) {
-    return null;
-  }
-  const propertyMatch = getLocalDpsFromProperties(code, device && device.properties);
-  if (propertyMatch !== null) {
-    return propertyMatch;
-  }
-  const normalized = code.toLowerCase();
-  if (normalized === 'switch' || normalized === 'power') {
-    return 1;
-  }
-  const match = normalized.match(/_(\d+)$/);
-  if (match) {
-    return parseInt(match[1], 10);
-  }
-  return null;
-};
-
-const getKnownDpsKeys = (features, device) => {
-  const keys = new Set();
-  if (!Array.isArray(features)) {
-    return keys;
-  }
-  features.forEach(feature => {
-    const parts = (feature.external_id || '').split(':');
-    const code = parts.length >= 3 ? parts[2] : null;
-    const dpsKey = getLocalDpsFromCode(code, device);
-    if (dpsKey !== null) {
-      keys.add(String(dpsKey));
-    }
-  });
-  return keys;
-};
-
-const getUnknownDpsKeys = (localPollDps, features, device) => {
-  if (!localPollDps || typeof localPollDps !== 'object') {
-    return [];
-  }
-  const knownKeys = getKnownDpsKeys(features, device);
-  const ignoredDps = getIgnoredLocalDps(device);
-  return Object.keys(localPollDps).filter(key => !knownKeys.has(key) && !ignoredDps.has(String(key)));
-};
-
-const getUnknownSpecificationCodes = (specifications, features, device) => {
-  if (!specifications || (!Array.isArray(specifications.functions) && !Array.isArray(specifications.status))) {
-    return [];
-  }
-  const knownCodes = new Set();
-  const addKnownCode = code => {
-    if (code !== null && code !== undefined) {
-      knownCodes.add(
-        String(code)
-          .trim()
-          .toLowerCase()
-      );
-    }
-  };
-  if (Array.isArray(features)) {
-    features.forEach(feature => {
-      const parts = (feature.external_id || '').split(':');
-      const code = parts.length >= 2 ? parts[parts.length - 1] : null;
-      addKnownCode(code);
-    });
-  }
-  const services = Array.isArray(device && device.thing_model && device.thing_model.services)
-    ? device.thing_model.services
-    : [];
-  services.forEach(service => {
-    const properties = Array.isArray(service && service.properties) ? service.properties : [];
-    properties.forEach(property => addKnownCode(property && property.code));
-  });
-  const propertiesPayload = device && device.properties;
-  const properties = Array.isArray(propertiesPayload)
-    ? propertiesPayload
-    : Array.isArray(propertiesPayload && propertiesPayload.properties)
-    ? propertiesPayload.properties
-    : [];
-  properties.forEach(property => addKnownCode(property && property.code));
-  const specCodes = new Set();
-  ['functions', 'status'].forEach(key => {
-    const entries = specifications[key];
-    if (!Array.isArray(entries)) {
-      return;
-    }
-    entries.forEach(entry => {
-      if (entry && entry.code) {
-        specCodes.add(entry.code);
-      }
-    });
-  });
-  const ignoredCodes = getIgnoredCloudCodes(device);
-  return Array.from(specCodes).filter(code => {
-    const normalized = String(code)
-      .trim()
-      .toLowerCase();
-    return !knownCodes.has(normalized) && !ignoredCodes.has(normalized);
-  });
-};
 
 const parseDate = dateValue => {
   if (!dateValue) {
@@ -237,161 +82,6 @@ const resolveOnlineStatus = device => {
   return false;
 };
 
-const buildParamsMap = device =>
-  (Array.isArray(device && device.params) ? device.params : []).reduce((acc, param) => {
-    acc[param.name] = param.value;
-    return acc;
-  }, {});
-
-const getParamValue = (device, name) => {
-  const params = Array.isArray(device && device.params) ? device.params : [];
-  const found = params.find(param => param.name === name);
-  return found ? found.value : undefined;
-};
-
-const getLocalOverrideValue = device => {
-  if (!device) {
-    return undefined;
-  }
-  if (device.local_override !== undefined && device.local_override !== null) {
-    return device.local_override;
-  }
-  return getParamValue(device, 'LOCAL_OVERRIDE');
-};
-
-const getLocalPollDpsFromParams = device => {
-  const raw = getParamValue(device, 'LOCAL_POLL_DPS');
-  if (!raw) {
-    return null;
-  }
-  if (typeof raw === 'object') {
-    return raw;
-  }
-  try {
-    return JSON.parse(raw);
-  } catch (e) {
-    return null;
-  }
-};
-
-const getProductIdentifier = device =>
-  device.product_id ||
-  getParamValue(device, 'PRODUCT_ID') ||
-  device.product_key ||
-  getParamValue(device, 'PRODUCT_KEY') ||
-  'unknown-product';
-
-const buildIssueTitle = device => {
-  const isLocal = normalizeBoolean(getLocalOverrideValue(device));
-  const modeLabel = isLocal ? 'local' : 'cloud';
-  const productIdentifier = getProductIdentifier(device);
-  const modelLabel = device.model || device.product_name || device.name || 'Unknown device';
-  return `Tuya (${modeLabel}) [${productIdentifier}]: Add support for ${modelLabel}`;
-};
-
-const buildGithubSearchQuery = title => `repo:GladysAssistant/Gladys in:title "${title}"`;
-
-const buildGithubSearchUrl = title => `${GITHUB_SEARCH_BASE_URL}${encodeURIComponent(buildGithubSearchQuery(title))}`;
-
-const setGithubIssueCache = (query, value) => {
-  if (githubIssueCache.has(query)) {
-    githubIssueCache.delete(query);
-  }
-  if (githubIssueCache.size >= MAX_GITHUB_CACHE_SIZE) {
-    const oldestKey = githubIssueCache.keys().next().value;
-    if (oldestKey !== undefined) {
-      githubIssueCache.delete(oldestKey);
-    }
-  }
-  githubIssueCache.set(query, value);
-};
-
-const checkGithubIssueExists = async title => {
-  const query = buildGithubSearchQuery(title);
-  const cached = githubIssueCache.get(query);
-  if (cached && Date.now() - cached.timestamp < GITHUB_SEARCH_CACHE_TTL_MS) {
-    return cached.exists;
-  }
-
-  let response;
-  if (typeof AbortController === 'undefined') {
-    response = await fetch(`${GITHUB_SEARCH_API_URL}${encodeURIComponent(query)}`);
-  } else {
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 5000);
-    try {
-      response = await fetch(`${GITHUB_SEARCH_API_URL}${encodeURIComponent(query)}`, {
-        signal: controller.signal
-      });
-    } finally {
-      clearTimeout(timeoutId);
-    }
-  }
-  if (!response.ok) {
-    throw new Error('Github search failed');
-  }
-  const data = await response.json();
-  const exists = Boolean(data && typeof data.total_count === 'number' && data.total_count > 0);
-  setGithubIssueCache(query, { exists, timestamp: Date.now() });
-  return exists;
-};
-
-const buildIssuePayload = (device, localPollStatus, localPollError, localPollValidation, localPollDps) => {
-  if (!device) {
-    return null;
-  }
-  const productId = device.product_id || getParamValue(device, 'PRODUCT_ID') || null;
-  const productKey = device.product_key || getParamValue(device, 'PRODUCT_KEY') || null;
-  return {
-    id: device.id || null,
-    name: device.name || null,
-    selector: device.selector || null,
-    model: device.model || device.product_name || null,
-    external_id: device.external_id || null,
-    service_id: device.service_id || null,
-    product_id: productId,
-    product_key: productKey,
-    online: device.online !== undefined ? device.online : null,
-    protocol_version: device.protocol_version || null,
-    local_override: getLocalOverrideValue(device),
-    specifications: device.specifications || null,
-    properties: device.properties || null,
-    thing_model: device.thing_model || null,
-    features: Array.isArray(device.features) ? device.features : [],
-    params: sanitizeParams(device.params),
-    local_poll: {
-      status: localPollStatus || null,
-      error: localPollError || null,
-      protocol: localPollValidation ? localPollValidation.protocol : null,
-      dps: localPollDps || null
-    }
-  };
-};
-
-const buildIssueBody = (device, localPollStatus, localPollError, localPollValidation, localPollDps) =>
-  `\`\`\`json\n${JSON.stringify(
-    buildIssuePayload(device, localPollStatus, localPollError, localPollValidation, localPollDps),
-    null,
-    2
-  )}\n\`\`\``;
-
-const createGithubIssueData = (device, localPollStatus, localPollError, localPollValidation, localPollDps) => {
-  const title = encodeURIComponent(buildIssueTitle(device));
-  const body = buildIssueBody(device, localPollStatus, localPollError, localPollValidation, localPollDps);
-  const urlWithBody = `${GITHUB_BASE_URL}?title=${title}&body=${encodeURIComponent(body)}`;
-  if (urlWithBody.length <= MAX_GITHUB_URL_LENGTH) {
-    return { url: urlWithBody, body, truncated: false };
-  }
-  return {
-    url: `${GITHUB_BASE_URL}?title=${title}`,
-    body,
-    truncated: true
-  };
-};
-
-const createGithubUrl = (device, localPollStatus, localPollError, localPollValidation, localPollDps) =>
-  createGithubIssueData(device, localPollStatus, localPollError, localPollValidation, localPollDps).url;
-
 const buildComparableDevice = device => {
   if (!device) {
     return null;
@@ -478,10 +168,16 @@ class TuyaDeviceBox extends Component {
     const isNewDevice = !currentDevice || currentDevice.external_id !== nextDevice.external_id;
     const baselineDevice = this.state.baselineDevice;
     const shouldRefreshBaseline = isNewDevice || !baselineDevice || baselineDevice.updated_at !== nextDevice.updated_at;
-    const mergedNextDevice =
+    let mergedNextDevice =
       currentDevice && currentDevice.specifications && !nextDevice.specifications
         ? { ...nextDevice, specifications: currentDevice.specifications }
         : nextDevice;
+    if (currentDevice && currentDevice.tuya_report && !mergedNextDevice.tuya_report) {
+      mergedNextDevice = {
+        ...mergedNextDevice,
+        tuya_report: currentDevice.tuya_report
+      };
+    }
     if (isNewDevice) {
       this.setState({
         device: mergedNextDevice,
@@ -858,11 +554,10 @@ class TuyaDeviceBox extends Component {
     if (!shouldOpenIssue) {
       return;
     }
-    const title = encodeURIComponent(issueTitle);
     if (popup && !popup.closed) {
-      popup.location.href = `${GITHUB_BASE_URL}?title=${title}`;
+      popup.location.href = createEmptyGithubIssueUrl(issueTitle);
     } else {
-      window.open(`${GITHUB_BASE_URL}?title=${title}`, '_blank');
+      window.open(createEmptyGithubIssueUrl(issueTitle), '_blank');
     }
     this.setState({ githubIssueOpened: true });
   };
diff --git a/front/src/routes/integration/all/tuya/commons/deviceHelpers.js b/front/src/routes/integration/all/tuya/commons/deviceHelpers.js
new file mode 100644
index 0000000000..d9b40b8b6e
--- /dev/null
+++ b/front/src/routes/integration/all/tuya/commons/deviceHelpers.js
@@ -0,0 +1,160 @@
+const LOCAL_CODE_ALIASES = {
+  switch: ['power'],
+  power: ['switch']
+};
+
+export const normalizeBoolean = value =>
+  value === true || value === 1 || value === '1' || value === 'true' || value === 'TRUE';
+
+const getIgnoredLocalDps = device => {
+  const mapping = device && device.tuya_mapping ? device.tuya_mapping : null;
+  const ignored = mapping && Array.isArray(mapping.ignored_local_dps) ? mapping.ignored_local_dps : [];
+  return new Set(ignored.map(value => String(value)));
+};
+
+const getIgnoredCloudCodes = device => {
+  const mapping = device && device.tuya_mapping ? device.tuya_mapping : null;
+  const ignored = mapping && Array.isArray(mapping.ignored_cloud_codes) ? mapping.ignored_cloud_codes : [];
+  return new Set(ignored.map(value => String(value).toLowerCase()));
+};
+
+const getLocalDpsFromProperties = (code, properties) => {
+  if (!code || !properties) {
+    return null;
+  }
+  const list = Array.isArray(properties.properties) ? properties.properties : properties;
+  if (!Array.isArray(list)) {
+    return null;
+  }
+  const normalized = code.toLowerCase();
+  const candidates = [normalized, ...(LOCAL_CODE_ALIASES[normalized] || [])];
+  for (let i = 0; i < candidates.length; i += 1) {
+    const candidate = candidates[i];
+    const match = list.find(item => item && item.code && item.code.toLowerCase() === candidate);
+    if (match && match.dp_id !== undefined && match.dp_id !== null) {
+      return match.dp_id;
+    }
+  }
+  return null;
+};
+
+const getLocalDpsFromCode = (code, device) => {
+  if (!code) {
+    return null;
+  }
+  const propertyMatch = getLocalDpsFromProperties(code, device && device.properties);
+  if (propertyMatch !== null) {
+    return propertyMatch;
+  }
+  const normalized = code.toLowerCase();
+  if (normalized === 'switch' || normalized === 'power') {
+    return 1;
+  }
+  const match = normalized.match(/_(\d+)$/);
+  if (match) {
+    return parseInt(match[1], 10);
+  }
+  return null;
+};
+
+const getKnownDpsKeys = (features, device) => {
+  const keys = new Set();
+  if (!Array.isArray(features)) {
+    return keys;
+  }
+  features.forEach(feature => {
+    const parts = (feature.external_id || '').split(':');
+    const code = parts.length >= 3 ? parts[2] : null;
+    const dpsKey = getLocalDpsFromCode(code, device);
+    if (dpsKey !== null) {
+      keys.add(String(dpsKey));
+    }
+  });
+  return keys;
+};
+
+export const getUnknownDpsKeys = (localPollDps, features, device) => {
+  if (!localPollDps || typeof localPollDps !== 'object') {
+    return [];
+  }
+  const knownKeys = getKnownDpsKeys(features, device);
+  const ignoredDps = getIgnoredLocalDps(device);
+  return Object.keys(localPollDps).filter(key => !knownKeys.has(key) && !ignoredDps.has(String(key)));
+};
+
+export const getUnknownSpecificationCodes = (specifications, features, device) => {
+  if (!specifications || (!Array.isArray(specifications.functions) && !Array.isArray(specifications.status))) {
+    return [];
+  }
+  const knownCodes = new Set();
+  if (Array.isArray(features)) {
+    features.forEach(feature => {
+      const parts = (feature.external_id || '').split(':');
+      const code = parts.length >= 3 ? parts[2] : null;
+      if (code) {
+        knownCodes.add(code.toLowerCase());
+      }
+    });
+  }
+  const specCodes = new Set();
+  ['functions', 'status'].forEach(key => {
+    const entries = specifications[key];
+    if (!Array.isArray(entries)) {
+      return;
+    }
+    entries.forEach(entry => {
+      if (entry && entry.code) {
+        specCodes.add(entry.code);
+      }
+    });
+  });
+  const ignoredCodes = getIgnoredCloudCodes(device);
+  return Array.from(specCodes).filter(code => {
+    const normalized = code.toLowerCase();
+    return !knownCodes.has(normalized) && !ignoredCodes.has(normalized);
+  });
+};
+
+export const buildParamsMap = device =>
+  (Array.isArray(device && device.params) ? device.params : []).reduce((acc, param) => {
+    acc[param.name] = param.value;
+    return acc;
+  }, {});
+
+export const getParamValue = (device, name) => {
+  const params = Array.isArray(device && device.params) ? device.params : [];
+  const found = params.find(param => param.name === name);
+  return found ? found.value : undefined;
+};
+
+export const getLocalOverrideValue = device => {
+  if (!device) {
+    return undefined;
+  }
+  if (device.local_override !== undefined && device.local_override !== null) {
+    return device.local_override;
+  }
+  return getParamValue(device, 'LOCAL_OVERRIDE');
+};
+
+export const getLocalPollDpsFromParams = device => {
+  const raw = getParamValue(device, 'LOCAL_POLL_DPS');
+  if (!raw) {
+    return null;
+  }
+  if (typeof raw === 'object') {
+    return raw;
+  }
+  try {
+    return JSON.parse(raw);
+  } catch (e) {
+    return null;
+  }
+};
+
+export const getProductIdentifier = device =>
+  device.product_id ||
+  getParamValue(device, 'PRODUCT_ID') ||
+  device.product_key ||
+  getParamValue(device, 'PRODUCT_KEY') ||
+  'unknown-product';
diff --git a/front/src/routes/integration/all/tuya/commons/githubIssue.js b/front/src/routes/integration/all/tuya/commons/githubIssue.js
new file mode 100644
index 0000000000..05b43afe61
--- /dev/null
+++ b/front/src/routes/integration/all/tuya/commons/githubIssue.js
@@ -0,0 +1,525 @@
+import get from 'get-value';
+import {
+  normalizeBoolean,
+  buildParamsMap,
+  getParamValue,
+  getLocalOverrideValue,
+  getProductIdentifier,
+  getUnknownDpsKeys,
+  getUnknownSpecificationCodes
+} from './deviceHelpers';
+
+const GITHUB_BASE_URL = 'https://github.com/GladysAssistant/Gladys/issues/new';
+const GITHUB_SEARCH_BASE_URL = 'https://github.com/GladysAssistant/Gladys/issues?q=';
+const GITHUB_SEARCH_API_URL = 'https://api.github.com/search/issues?q=';
+const GITHUB_SEARCH_CACHE_TTL_MS = 1000 * 60 * 5;
+const MAX_GITHUB_CACHE_SIZE = 100;
+const MAX_GITHUB_URL_LENGTH = 8000;
+const githubIssueCache = new Map();
+
+const maskIp = ip => {
+  if (!ip || typeof ip !== 'string') {
+    return null;
+  }
+  const parts = ip.split('.');
+  if (parts.length !== 4 || parts.some(part => part === '' || Number.isNaN(parseInt(part, 10)))) {
+    return null;
+  }
+  return `${parts[0]}.x.x.x`;
+};
+
+const sanitizeParams = params => {
+  if (!Array.isArray(params)) {
+    return [];
+  }
+  return params.map(param => {
+    if (param.name === 'LOCAL_KEY') {
+      return { ...param, value: '***' };
+    }
+    if (param.name === 'IP_ADDRESS' || param.name === 'CLOUD_IP') {
+      return { ...param, value: maskIp(param.value) };
+    }
+    return param;
+  });
+};
+
+const sanitizeIssueValue = (key, value) => {
+  if (key === 'local_key') {
+    return '***';
+  }
+  if ((key === 'ip' || key === 'cloud_ip') && typeof value === 'string') {
+    return maskIp(value);
+  }
+  if (Array.isArray(value)) {
+    return value.map(item => sanitizeIssueValue(null, item));
+  }
+  if (value && typeof value === 'object') {
+    return Object.keys(value).reduce((acc, currentKey) => {
+      acc[currentKey] = sanitizeIssueValue(currentKey, value[currentKey]);
+      return acc;
+    }, {});
+  }
+  return value;
+};
+
+const buildFallbackTuyaReport = device => ({
+  schema_version: 2,
+  cloud: {
+    assembled: {
+      specifications: (device && device.specifications) || null,
+      properties: (device && device.properties) || null,
+      thing_model: (device && device.thing_model) || null
+    },
+    raw: {
+      device_list_entry: null,
+      device_specification: null,
+      device_details: null,
+      thing_shadow_properties: null,
+      thing_model: null
+    }
+  },
+  local: {
+    scan: null
+  }
+});
+
+const getSanitizedTuyaReport = device =>
+  sanitizeIssueValue(null, device && device.tuya_report ? device.tuya_report : buildFallbackTuyaReport(device));
+
+const getDeviceId = device => {
+  if (!device) {
+    return null;
+  }
+  if (device.id) {
+    return device.id;
+  }
+  const paramDeviceId = getParamValue(device, 'DEVICE_ID');
+  if (paramDeviceId) {
+    return paramDeviceId;
+  }
+  if (device.external_id && device.external_id.includes(':')) {
+    return device.external_id.split(':')[1] || null;
+  }
+  return null;
+};
+
+const compactObject = value => {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return value;
+  }
+  return Object.keys(value).reduce((acc, key) => {
+    if (value[key] !== undefined && value[key] !== null) {
+      acc[key] = value[key];
+    }
+    return acc;
+  }, {});
+};
+
+const isResolvedDeviceType = value => !!value && value !== 'unknown';
+
+const toPrettyJson = value => JSON.stringify(value, null, 2);
+
+const toCodeBlock = (language, value) =>
+  `\`\`\`${language}\n${typeof value === 'string' ? value : toPrettyJson(value)}\n\`\`\``;
+
+const slugifyFixturePart = value => {
+  if (!value || typeof value !== 'string') {
+    return 'tuya-device';
+  }
+  const slug = value
+    .normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/^-+|-+$/g, '');
+  return slug || 'tuya-device';
+};
+
+const buildSuggestedFixtureDirectory = issuePayload => {
+  const modelPart = slugifyFixturePart(get(issuePayload, 'device.model') || get(issuePayload, 'device.name'));
+  const productPart = slugifyFixturePart(get(issuePayload, 'device.product_id') || get(issuePayload, 'device.id'));
+  if (modelPart === productPart) {
+    return modelPart;
+  }
+  return `${modelPart}-${productPart}`;
+};
+
+const buildSuggestedInputDevice = issuePayload => {
+  const device = issuePayload && issuePayload.device ? issuePayload.device : {};
+  const params = buildParamsMap(device);
+  const details = get(issuePayload, 'cloud.raw.device_details.response.result') || {};
+  return compactObject({
+    id: device.id || details.id || params.DEVICE_ID,
+    name: device.name || details.name,
+    product_name: details.product_name || device.model,
+    model: details.model || device.model,
+    product_id: device.product_id || details.product_id,
+    product_key: device.product_key || details.product_key || params.PRODUCT_KEY,
+    local_key: details.local_key || params.LOCAL_KEY,
+    ip: params.IP_ADDRESS || null,
+    cloud_ip: params.CLOUD_IP || details.ip,
+    protocol_version: device.protocol_version || null,
+    local_override: normalizeBoolean(device.local_override),
+    online: device.online,
+    specifications: get(issuePayload, 'cloud.assembled.specifications') || {},
+    properties: get(issuePayload, 'cloud.assembled.properties') || {},
+    thing_model: get(issuePayload, 'cloud.assembled.thing_model') || null
+  });
+};
+
+const buildSuggestedPollDevice = issuePayload =>
+  compactObject({
+    external_id: get(issuePayload, 'device.external_id') || null,
+    device_type: isResolvedDeviceType(get(issuePayload, 'device.device_type'))
+      ? get(issuePayload, 'device.device_type')
+      : null,
+    params: get(issuePayload, 'device.params') || [],
+    features: get(issuePayload, 'device.features') || [],
+    tuya_mapping: get(issuePayload, 'device.tuya_mapping') || null
+  });
+
+const buildSuggestedCloudStatus = issuePayload => {
+  const properties = get(issuePayload, 'cloud.assembled.properties.properties') || [];
+  return {
+    result: properties
+      .filter(item => item && item.code !== undefined && item.code !== null && item.value !== undefined)
+      .map(item => ({
+        code: item.code,
+        value: item.value
+      }))
+  };
+};
+
+const escapeJsString = value =>
+  String(value || '')
+    .replace(/\\/g, '\\\\')
+    .replace(/'/g, "\\'");
+
+const buildSuggestedManifest = issuePayload => {
+  const name = get(issuePayload, 'device.name') || get(issuePayload, 'device.model') || 'tuya device';
+  const hasLocalPoll = !!get(issuePayload, 'local.poll.dps');
+  const lines = [
+    'module.exports = {',
+    `  name: '${escapeJsString(name)}',`,
+    '  convertDevice: {',
+    "    input: './input-device.json',",
+    "    expected: './expected-device.json',",
+    '  },',
+    '  pollCloud: {',
+    "    device: './poll-device.json',",
+    "    response: './cloud-status.json',",
+    "    expectedEvents: './expected-cloud-events.json',",
+    '  },'
+  ];
+  if (hasLocalPoll) {
+    lines.push(
+      '  pollLocal: {',
+      "    device: './poll-device.json',",
+      "    dps: './local-dps.json',",
+      "    expectedEvents: './expected-local-events.json',",
+      '    expectedCloudRequests: 0,',
+      '  },'
+    );
+  }
+  lines.push(
+    '  localMapping: {',
+    "    device: './poll-device.json',",
+    "    expected: './expected-local-mapping.json',",
+    '  },',
+    '};'
+  );
+  return lines.join('\n');
+};
+
+const buildSupplementalDiagnostics = (device, issuePayload, localPollStatus, localPollError, effectiveLocalPollDps) => {
+  const unknownSpecificationCodes = getUnknownSpecificationCodes(device.specifications, device.features, device);
+  const unknownLocalDpsKeys = getUnknownDpsKeys(effectiveLocalPollDps, device.features, device);
+  return compactObject({
+    selector: get(issuePayload, 'device.selector') || null,
+    service_id: get(issuePayload, 'device.service_id') || null,
+    device_type: get(issuePayload, 'device.device_type') || null,
+    protocol_version: get(issuePayload, 'device.protocol_version') || null,
+    poll_frequency: get(issuePayload, 'device.poll_frequency') || null,
+    should_poll: get(issuePayload, 'device.should_poll') || null,
+    local_poll_status: localPollStatus || null,
+    local_poll_error: localPollError || null,
+    unknown_specification_codes: unknownSpecificationCodes.length > 0 ? unknownSpecificationCodes : undefined,
+    unknown_local_dps: unknownLocalDpsKeys.length > 0 ? unknownLocalDpsKeys : undefined
+  });
+};
+
+export const buildIssueTitle = device => {
+  const isLocal = normalizeBoolean(getLocalOverrideValue(device));
+  const modeLabel = isLocal ? 'local' : 'cloud';
+  const productIdentifier = getProductIdentifier(device);
+  const modelLabel = device.model || device.product_name || device.name || 'Unknown device';
+  return `Tuya (${modeLabel}) [${productIdentifier}]: Add support for ${modelLabel}`;
+};
+
+const buildGithubSearchQuery = title => `repo:GladysAssistant/Gladys in:title "${title}"`;
+
+export const buildGithubSearchUrl = title =>
+  `${GITHUB_SEARCH_BASE_URL}${encodeURIComponent(buildGithubSearchQuery(title))}`;
+
+const setGithubIssueCache = (query, value) => {
+  if (githubIssueCache.has(query)) {
+    githubIssueCache.delete(query);
+  }
+  if (githubIssueCache.size >= MAX_GITHUB_CACHE_SIZE) {
+    const oldestKey = githubIssueCache.keys().next().value;
+    if (oldestKey !== undefined) {
+      githubIssueCache.delete(oldestKey);
+    }
+  }
+  githubIssueCache.set(query, value);
+};
+
+export const checkGithubIssueExists = async title => {
+  const query = buildGithubSearchQuery(title);
+  const cached = githubIssueCache.get(query);
+  if (cached && Date.now() - cached.timestamp < GITHUB_SEARCH_CACHE_TTL_MS) {
+    return cached.exists;
+  }
+
+  let response;
+  if (typeof AbortController === 'undefined') {
+    response = await fetch(`${GITHUB_SEARCH_API_URL}${encodeURIComponent(query)}`);
+  } else {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 5000);
+    try {
+      response = await fetch(`${GITHUB_SEARCH_API_URL}${encodeURIComponent(query)}`, {
+        signal: controller.signal
+      });
+    } finally {
+      clearTimeout(timeoutId);
+    }
+  }
+  if (!response.ok) {
+    throw new Error('Github search failed');
+  }
+  const data = await response.json();
+  const exists = Boolean(data && typeof data.total_count === 'number' && data.total_count > 0);
+  setGithubIssueCache(query, { exists, timestamp: Date.now() });
+  return exists;
+};
+
+const buildIssuePayload = (device, localPollStatus, localPollError, localPollValidation, localPollDps) => {
+  if (!device) {
+    return null;
+  }
+  const productId = device.product_id || getParamValue(device, 'PRODUCT_ID') || null;
+  const productKey = device.product_key || getParamValue(device, 'PRODUCT_KEY') || null;
+  const tuyaReport = getSanitizedTuyaReport(device);
+  return {
+    schema_version: tuyaReport && tuyaReport.schema_version ? tuyaReport.schema_version : 2,
+    report_type: 'tuya-unsupported-device',
+    device: {
+      id: getDeviceId(device),
+      name: device.name || null,
+      selector: device.selector || null,
+      model: device.model || device.product_name || null,
+      external_id: device.external_id || null,
+      service_id: device.service_id || null,
+      product_id: productId,
+      product_key: productKey,
+      device_type: device.device_type || null,
+      online: device.online !== undefined ? device.online : null,
+      poll_frequency: device.poll_frequency !== undefined ? device.poll_frequency : null,
+      protocol_version: device.protocol_version || null,
+      local_override: getLocalOverrideValue(device),
+      should_poll: device.should_poll !== undefined ? device.should_poll : null,
+      features: Array.isArray(device.features) ? device.features : [],
+      params: sanitizeParams(device.params),
+      tuya_mapping: device.tuya_mapping || null
+    },
+    cloud: tuyaReport.cloud,
+    local: {
+      scan: tuyaReport.local ? tuyaReport.local.scan || null : null,
+      poll: {
+        status: localPollStatus || null,
+        error: localPollError || null,
+        protocol: localPollValidation ? localPollValidation.protocol : null,
+        dps: localPollDps || null
+      }
+    }
+  };
+};
+
+const buildIssueBody = (device, localPollStatus, localPollError, localPollValidation, localPollDps) => {
+  const issuePayload = buildIssuePayload(device, localPollStatus, localPollError, localPollValidation, localPollDps);
+  if (!issuePayload) {
+    return '';
+  }
+
+  const fixtureDirectory = buildSuggestedFixtureDirectory(issuePayload);
+  const inputDevice = buildSuggestedInputDevice(issuePayload);
+  const pollDevice = buildSuggestedPollDevice(issuePayload);
+  const cloudStatus = buildSuggestedCloudStatus(issuePayload);
+  const localDps = get(issuePayload, 'local.poll.dps') || null;
+  const localScan = get(issuePayload, 'local.scan.response') || null;
+  const supplementalDiagnostics = buildSupplementalDiagnostics(
+    device,
+    issuePayload,
+    localPollStatus,
+    localPollError,
+    localDps
+  );
+
+  const sections = [
+    '## Summary',
+    '',
+    'Unsupported or partially supported Tuya device report.',
+    '',
+    `- Device name: \`${get(issuePayload, 'device.name') || 'Unknown device'}\``,
+    `- External ID: \`${get(issuePayload, 'device.external_id') || 'unknown'}\``,
+    `- Product ID: \`${get(issuePayload, 'device.product_id') || 'unknown'}\``,
+    `- Product key: \`${get(issuePayload, 'device.product_key') || 'unknown'}\``,
+    `- Model: \`${get(issuePayload, 'device.model') || 'unknown'}\``,
+    `- Category: \`${get(issuePayload, 'cloud.assembled.specifications.category') || 'unknown'}\``,
+    `- Online: \`${String(get(issuePayload, 'device.online'))}\``,
+    `- Local override: \`${String(get(issuePayload, 'device.local_override'))}\``,
+    `- Local poll status: \`${get(issuePayload, 'local.poll.status') || 'not-run'}\``,
+    `- Local poll protocol: \`${get(issuePayload, 'local.poll.protocol') || 'unknown'}\``,
+    '',
+    '## Maintainer Notes',
+    '',
+    'This issue contains:',
+    '- the complete structured Tuya report',
+    '- suggested fixture input files for PR5-style onboarding tests',
+    '- raw cloud responses',
+    '- local poll DPS when available',
+    '',
+    'This issue does not contain:',
+    '- `expected-device.json`',
+    '- `expected-cloud-events.json`',
+    '- `expected-local-events.json`',
+    '- `expected-local-mapping.json`',
+    '',
+    'These expected files should still be reviewed and created manually.',
+    '',
+    '## Data Coverage',
+    '',
+    '- `GET /v1.0/users/{sourceId}/devices` -> `Device List Entry` below',
+    '- `GET /v1.2/iot-03/devices/{deviceId}/specification` -> `input-device.json > specifications`',
+    '- `GET /v1.0/iot-03/devices/{deviceId}` -> `input-device.json` top-level metadata',
+    '- `GET /v2.0/cloud/thing/{deviceId}/shadow/properties` -> `input-device.json > properties` and `cloud-status.json`',
+    '- `GET /v2.0/cloud/thing/{deviceId}/model` -> `input-device.json > thing_model`',
+    '- local poll -> `local-dps.json` when available',
+    '',
+    '## Suggested Fixture Folder',
+    '',
+    toCodeBlock('text', fixtureDirectory),
+    '',
+    'Example:',
+    '',
+    toCodeBlock('text', `server/test/services/tuya/fixtures/devices/${fixtureDirectory}`),
+    '',
+    '## Suggested File: manifest.js',
+    '',
+    toCodeBlock('js', buildSuggestedManifest(issuePayload)),
+    '',
+    '## Suggested File: input-device.json',
+    '',
+    'Use this as the base input for `convertDevice`.',
+    '',
+    toCodeBlock('json', inputDevice),
+    '',
+    '## Suggested File: poll-device.json',
+    '',
+    'Use this as the base Gladys device for cloud/local poll tests.',
+    '',
+    toCodeBlock('json', pollDevice),
+    '',
+    '## Suggested File: cloud-status.json',
+    '',
+    'Use this as the cloud poll response fixture.',
+    '',
+    'Derived from `cloud.assembled.properties`.',
+    '',
+    toCodeBlock('json', cloudStatus),
+    ''
+  ];
+
+  if (localDps) {
+    sections.push(
+      '## Suggested File: local-dps.json',
+      '',
+      'Use this as the local poll DPS fixture.',
+      '',
+      toCodeBlock('json', localDps),
+      ''
+    );
+  }
+
+  if (localScan) {
+    sections.push(
+      '## Suggested File: local-scan.json',
+      '',
+      'Use this only if a local scan payload exists.',
+      '',
+      toCodeBlock('json', localScan),
+      ''
+    );
+  }
+
+  sections.push(
+    '## Device List Entry',
+    '',
+    'Source: `GET /v1.0/users/{sourceId}/devices`.',
+    '',
+    toCodeBlock('json', get(issuePayload, 'cloud.raw.device_list_entry.response_item')),
+    '',
+    '## Supplemental Diagnostics',
+    '',
+    'Additional metadata that does not naturally belong to the suggested fixture files.',
+    '',
+    toCodeBlock('json', supplementalDiagnostics),
+    '',
+    'Note:',
+    '',
+    '- The raw `thing_model.response.result.model` string is intentionally omitted here because it is already represented in a readable object form in `input-device.json > thing_model`.',
+    '',
+    '## Remaining Files To Create Manually',
+    '',
+    toCodeBlock(
+      'text',
+      [
+        'expected-device.json',
+        'expected-cloud-events.json',
+        'expected-local-events.json',
+        'expected-local-mapping.json'
+      ].join('\n')
+    ),
+    '',
+    '## Validation Checklist',
+    '',
+    '- Confirm the inferred `device_type`',
+    '- Confirm the expected Gladys features',
+    '- Confirm cloud polling behavior',
+    '- Confirm local polling behavior',
+    '- Confirm local mapping',
+    '- Add or update mapping files if needed'
+  );
+
+  return sections.join('\n');
+};
+
+export const createGithubIssueData = (device, localPollStatus, localPollError, localPollValidation, localPollDps) => {
+  const title = encodeURIComponent(buildIssueTitle(device));
+  const body = buildIssueBody(device, localPollStatus, localPollError, localPollValidation, localPollDps);
+  const urlWithBody = `${GITHUB_BASE_URL}?title=${title}&body=${encodeURIComponent(body)}`;
+  if (urlWithBody.length <= MAX_GITHUB_URL_LENGTH) {
+    return { url: urlWithBody, body, truncated: false };
+  }
+  return {
+    url: `${GITHUB_BASE_URL}?title=${title}`,
+    body,
+    truncated: true
+  };
+};
+
+export const createGithubUrl = (device, localPollStatus, localPollError, localPollValidation, localPollDps) =>
+  createGithubIssueData(device, localPollStatus, localPollError, localPollValidation, localPollDps).url;
+
+export const createEmptyGithubIssueUrl = title => `${GITHUB_BASE_URL}?title=${encodeURIComponent(title)}`;
diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index d3b0d32cd9..91c1c4aa7c 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -1,6 +1,7 @@
 const { DEVICE_POLL_FREQUENCIES } = require('../../../../utils/constants');
 const { DEVICE_PARAM_NAME } = require('../utils/tuya.constants');
 const { normalizeBoolean } = require('../utils/tuya.normalize');
+const { mergeTuyaReport } = require('../utils/tuya.report');
 const { convertFeature } = require('./tuya.convertFeature');
 const { getDeviceType, getIgnoredCloudCodes, getIgnoredLocalDps } = require('../mappings');
 const logger = require('../../../../utils/logger');
@@ -29,6 +30,7 @@ function convertDevice(tuyaDevice) {
     thing_model: thingModel,
     specifications = {},
     category,
+    tuya_report: tuyaReport,
   } = tuyaDevice;
   const externalId = `tuya:${id}`;
   const { functions = [], status = [] } = specifications;
@@ -159,6 +161,9 @@ function convertDevice(tuyaDevice) {
   if (online !== undefined) {
     device.online = online;
   }
+  if (tuyaReport) {
+    device.tuya_report = mergeTuyaReport(null, tuyaReport);
+  }
   return device;
 }
 
diff --git a/server/services/tuya/lib/tuya.loadDeviceDetails.js b/server/services/tuya/lib/tuya.loadDeviceDetails.js
index 4d5c059e05..c832a79011 100644
--- a/server/services/tuya/lib/tuya.loadDeviceDetails.js
+++ b/server/services/tuya/lib/tuya.loadDeviceDetails.js
@@ -1,5 +1,6 @@
 const logger = require('../../../utils/logger');
 const { API } = require('./utils/tuya.constants');
+const { buildCloudReport } = require('./utils/tuya.report');
 
 /**
  * @description Load Tuya device details.
@@ -10,6 +11,7 @@ const { API } = require('./utils/tuya.constants');
  */
 async function loadDeviceDetails(tuyaDevice) {
   const { id: deviceId } = tuyaDevice;
+  const listDeviceEntry = tuyaDevice ? { ...tuyaDevice } : null;
   logger.debug(`Loading ${deviceId} Tuya device specifications`);
 
   const [specResult, detailsResult, propsResult, modelResult] = await Promise.allSettled([
@@ -72,13 +74,26 @@ async function loadDeviceDetails(tuyaDevice) {
   const specificationsWithCategory =
     category && !specifications.category ? { ...specifications, category } : specifications;
 
-  return {
+  const deviceWithDetails = {
     ...tuyaDevice,
     ...details,
     specifications: specificationsWithCategory,
     properties,
     thing_model: thingModel,
   };
+
+  return {
+    ...deviceWithDetails,
+    tuya_report: buildCloudReport({
+      deviceId,
+      listDeviceEntry,
+      specResult,
+      detailsResult,
+      propsResult,
+      modelResult,
+      device: deviceWithDetails,
+    }),
+  };
 }
 
 module.exports = {
diff --git a/server/services/tuya/lib/tuya.localScan.js b/server/services/tuya/lib/tuya.localScan.js
index 8364975e12..1fd11b4a68 100644
--- a/server/services/tuya/lib/tuya.localScan.js
+++ b/server/services/tuya/lib/tuya.localScan.js
@@ -9,6 +9,7 @@ const {
   normalizeExistingDevice,
   updateDiscoveredDeviceWithLocalInfo,
 } = require('./utils/tuya.deviceParams');
+const { buildLocalScanReport } = require('./utils/tuya.report');
 
 const DEFAULT_PORTS = [6666, 6667, 7000];
 /**
@@ -162,6 +163,7 @@ function buildLocalScanResponse(tuyaManager, localScanResult) {
         functions: [],
         status: [],
       },
+      tuya_report: buildLocalScanReport(localInfo),
     });
 
   if (tuyaManager && Array.isArray(tuyaManager.discoveredDevices)) {
diff --git a/server/services/tuya/lib/utils/tuya.deviceParams.js b/server/services/tuya/lib/utils/tuya.deviceParams.js
index e4bae3b1b0..b09c1185e5 100644
--- a/server/services/tuya/lib/utils/tuya.deviceParams.js
+++ b/server/services/tuya/lib/utils/tuya.deviceParams.js
@@ -1,5 +1,6 @@
 const { DEVICE_PARAM_NAME } = require('./tuya.constants');
 const { normalizeBoolean } = require('./tuya.normalize');
+const { buildLocalScanReport, withTuyaReport } = require('./tuya.report');
 
 const upsertParam = (params, name, value) => {
   if (value === undefined || value === null) {
@@ -53,7 +54,7 @@ const updateDiscoveredDeviceWithLocalInfo = (device, localInfo) => {
   upsertParam(updated.params, DEVICE_PARAM_NAME.IP_ADDRESS, updated.ip);
   upsertParam(updated.params, DEVICE_PARAM_NAME.PROTOCOL_VERSION, updated.protocol_version);
   upsertParam(updated.params, DEVICE_PARAM_NAME.PRODUCT_KEY, updated.product_key);
-  return updated;
+  return withTuyaReport(updated, buildLocalScanReport(localInfo));
 };
 
 const applyExistingLocalParams = (device, existingDevice) => {
diff --git a/server/services/tuya/lib/utils/tuya.report.js b/server/services/tuya/lib/utils/tuya.report.js
new file mode 100644
index 0000000000..4a8b82b2fc
--- /dev/null
+++ b/server/services/tuya/lib/utils/tuya.report.js
@@ -0,0 +1,162 @@
+const { API } = require('./tuya.constants');
+
+const REPORT_SCHEMA_VERSION = 2;
+
+const buildRequest = (method, path) => ({
+  method,
+  path,
+});
+
+const normalizeSettledResponse = (request, settledResult) => {
+  if (!settledResult) {
+    return null;
+  }
+  if (settledResult.status === 'fulfilled') {
+    return {
+      request,
+      response: settledResult.value || null,
+      error: null,
+    };
+  }
+  const error =
+    settledResult.reason && settledResult.reason.message ? settledResult.reason.message : settledResult.reason || null;
+  return {
+    request,
+    response: null,
+    error,
+  };
+};
+
+const createBaseReport = (currentReportInput = {}) => {
+  const currentReport = currentReportInput || {};
+  return {
+    schema_version: currentReport.schema_version || REPORT_SCHEMA_VERSION,
+    cloud: {
+      assembled: {
+        specifications:
+          currentReport.cloud && currentReport.cloud.assembled
+            ? currentReport.cloud.assembled.specifications || null
+            : null,
+        properties:
+          currentReport.cloud && currentReport.cloud.assembled
+            ? currentReport.cloud.assembled.properties || null
+            : null,
+        thing_model:
+          currentReport.cloud && currentReport.cloud.assembled
+            ? currentReport.cloud.assembled.thing_model || null
+            : null,
+      },
+      raw: {
+        device_list_entry:
+          currentReport.cloud && currentReport.cloud.raw ? currentReport.cloud.raw.device_list_entry || null : null,
+        device_specification:
+          currentReport.cloud && currentReport.cloud.raw ? currentReport.cloud.raw.device_specification || null : null,
+        device_details:
+          currentReport.cloud && currentReport.cloud.raw ? currentReport.cloud.raw.device_details || null : null,
+        thing_shadow_properties:
+          currentReport.cloud && currentReport.cloud.raw
+            ? currentReport.cloud.raw.thing_shadow_properties || null
+            : null,
+        thing_model:
+          currentReport.cloud && currentReport.cloud.raw ? currentReport.cloud.raw.thing_model || null : null,
+      },
+    },
+    local: {
+      scan: currentReport.local ? currentReport.local.scan || null : null,
+    },
+  };
+};
+
+const mergeTuyaReport = (currentReport, reportPatch) => {
+  const base = createBaseReport(currentReport);
+  if (!reportPatch) {
+    return base;
+  }
+  return {
+    schema_version: reportPatch.schema_version || base.schema_version,
+    cloud: {
+      assembled: {
+        ...base.cloud.assembled,
+        ...(reportPatch.cloud && reportPatch.cloud.assembled ? reportPatch.cloud.assembled : {}),
+      },
+      raw: {
+        ...base.cloud.raw,
+        ...(reportPatch.cloud && reportPatch.cloud.raw ? reportPatch.cloud.raw : {}),
+      },
+    },
+    local: {
+      ...base.local,
+      ...(reportPatch.local || {}),
+    },
+  };
+};
+
+const withTuyaReport = (device, reportPatch) => {
+  if (!device) {
+    return device;
+  }
+  return {
+    ...device,
+    tuya_report: mergeTuyaReport(device.tuya_report, reportPatch),
+  };
+};
+
+const buildDeviceListEntryReport = (deviceListEntry) => {
+  if (!deviceListEntry) {
+    return null;
+  }
+  return {
+    request: buildRequest('GET', `${API.PUBLIC_VERSION_1_0}/users/{sourceId}/devices`),
+    response_item: deviceListEntry,
+  };
+};
+
+const buildLocalScanReport = (localInfo) => ({
+  local: {
+    scan: localInfo
+      ? {
+          source: 'udp',
+          response: localInfo,
+        }
+      : null,
+  },
+});
+
+const buildCloudReport = ({ deviceId, listDeviceEntry, specResult, detailsResult, propsResult, modelResult, device }) =>
+  mergeTuyaReport(null, {
+    schema_version: REPORT_SCHEMA_VERSION,
+    cloud: {
+      assembled: {
+        specifications: device && device.specifications ? device.specifications : null,
+        properties: device && device.properties ? device.properties : null,
+        thing_model: device && device.thing_model ? device.thing_model : null,
+      },
+      raw: {
+        device_list_entry: buildDeviceListEntryReport(listDeviceEntry),
+        device_specification: normalizeSettledResponse(
+          buildRequest('GET', `${API.VERSION_1_2}/devices/${deviceId}/specification`),
+          specResult,
+        ),
+        device_details: normalizeSettledResponse(
+          buildRequest('GET', `${API.VERSION_1_0}/devices/${deviceId}`),
+          detailsResult,
+        ),
+        thing_shadow_properties: normalizeSettledResponse(
+          buildRequest('GET', `${API.VERSION_2_0}/thing/${deviceId}/shadow/properties`),
+          propsResult,
+        ),
+        thing_model: normalizeSettledResponse(
+          buildRequest('GET', `${API.VERSION_2_0}/thing/${deviceId}/model`),
+          modelResult,
+        ),
+      },
+    },
+  });
+
+module.exports = {
+  REPORT_SCHEMA_VERSION,
+  buildCloudReport,
+  buildLocalScanReport,
+  mergeTuyaReport,
+  withTuyaReport,
+};
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index 402894cf85..1c511b7e73 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -4,7 +4,7 @@ const sinon = require('sinon');
 const { assert, fake } = sinon;
 
 const TuyaHandler = require('../../../../services/tuya/lib/index');
-const { STATUS } = require('../../../../services/tuya/lib/utils/tuya.constants');
+const { API, STATUS } = require('../../../../services/tuya/lib/utils/tuya.constants');
 const { EVENTS, WEBSOCKET_MESSAGE_TYPES } = require('../../../../utils/constants');
 const { ServiceNotConfiguredError } = require('../../../../utils/coreErrors');
 
@@ -216,6 +216,120 @@ describe('TuyaHandler.discoverDevices', () => {
         thing_model: {
           services: [],
         },
+        tuya_report: {
+          schema_version: 2,
+          cloud: {
+            assembled: {
+              specifications: {
+                details: 'details',
+                category: 'cz',
+                functions: [
+                  {
+                    code: 'switch_1',
+                    name: 'name',
+                    type: 'Boolean',
+                  },
+                ],
+                status: [
+                  {
+                    code: 'cur_power',
+                    name: 'cur_power',
+                    type: 'Integer',
+                  },
+                ],
+              },
+              properties: {
+                properties: [{ code: 'switch_1', value: true }],
+              },
+              thing_model: {
+                services: [],
+              },
+            },
+            raw: {
+              device_list_entry: {
+                request: {
+                  method: 'GET',
+                  path: '/v1.0/users/{sourceId}/devices',
+                },
+                response_item: {
+                  name: 'name',
+                  id: 'uuid',
+                  product_name: 'model',
+                  local_key: 'localKey',
+                  ip: '1.1.1.1',
+                  online: true,
+                },
+              },
+              device_specification: {
+                request: {
+                  method: 'GET',
+                  path: `${API.VERSION_1_2}/devices/uuid/specification`,
+                },
+                response: {
+                  result: {
+                    details: 'details',
+                    functions: [
+                      {
+                        name: 'name',
+                        code: 'switch_1',
+                        type: 'Boolean',
+                      },
+                    ],
+                    status: [
+                      {
+                        name: 'cur_power',
+                        code: 'cur_power',
+                        type: 'Integer',
+                      },
+                    ],
+                    category: 'cz',
+                  },
+                },
+                error: null,
+              },
+              device_details: {
+                request: {
+                  method: 'GET',
+                  path: `${API.VERSION_1_0}/devices/uuid`,
+                },
+                response: {
+                  result: {
+                    local_key: 'localKey',
+                    ip: '1.1.1.1',
+                  },
+                },
+                error: null,
+              },
+              thing_shadow_properties: {
+                request: {
+                  method: 'GET',
+                  path: `${API.VERSION_2_0}/thing/uuid/shadow/properties`,
+                },
+                response: {
+                  result: {
+                    properties: [{ code: 'switch_1', value: true }],
+                  },
+                },
+                error: null,
+              },
+              thing_model: {
+                request: {
+                  method: 'GET',
+                  path: `${API.VERSION_2_0}/thing/uuid/model`,
+                },
+                response: {
+                  result: {
+                    model: '{"services":[]}',
+                  },
+                },
+                error: null,
+              },
+            },
+          },
+          local: {
+            scan: null,
+          },
+        },
         tuya_mapping: {
           ignored_cloud_codes: ['countdown', 'countdown_1'],
           ignored_local_dps: ['11'],
diff --git a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
index d3a41b0c91..8faaa90448 100644
--- a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
@@ -10,6 +10,75 @@ const logger = require('../../../../utils/logger');
 const gladys = {};
 const serviceId = 'ffa13430-df93-488a-9733-5c540e9558e0';
 
+const buildExpectedReport = ({
+  deviceId,
+  listEntry,
+  specificationResponse,
+  detailsResponse,
+  propertiesResponse,
+  modelResponse,
+  specificationError = null,
+  detailsError = null,
+  propertiesError = null,
+  modelError = null,
+  specifications = null,
+  properties = null,
+  thingModel = null,
+}) => ({
+  schema_version: 2,
+  cloud: {
+    assembled: {
+      specifications,
+      properties,
+      thing_model: thingModel,
+    },
+    raw: {
+      device_list_entry: {
+        request: {
+          method: 'GET',
+          path: `${API.PUBLIC_VERSION_1_0}/users/{sourceId}/devices`,
+        },
+        response_item: listEntry,
+      },
+      device_specification: {
+        request: {
+          method: 'GET',
+          path: `${API.VERSION_1_2}/devices/${deviceId}/specification`,
+        },
+        response: specificationResponse,
+        error: specificationError,
+      },
+      device_details: {
+        request: {
+          method: 'GET',
+          path: `${API.VERSION_1_0}/devices/${deviceId}`,
+        },
+        response: detailsResponse,
+        error: detailsError,
+      },
+      thing_shadow_properties: {
+        request: {
+          method: 'GET',
+          path: `${API.VERSION_2_0}/thing/${deviceId}/shadow/properties`,
+        },
+        response: propertiesResponse,
+        error: propertiesError,
+      },
+      thing_model: {
+        request: {
+          method: 'GET',
+          path: `${API.VERSION_2_0}/thing/${deviceId}/model`,
+        },
+        response: modelResponse,
+        error: modelError,
+      },
+    },
+  },
+  local: {
+    scan: null,
+  },
+});
+
 describe('TuyaHandler.loadDeviceDetails', () => {
   const tuyaHandler = new TuyaHandler(gladys, serviceId);
 
@@ -45,6 +114,17 @@ describe('TuyaHandler.loadDeviceDetails', () => {
       specifications: { details: 'specification' },
       properties: { dps: { 1: true } },
       thing_model: { services: [] },
+      tuya_report: buildExpectedReport({
+        deviceId: 1,
+        listEntry: { id: 1 },
+        specificationResponse: { result: { details: 'specification' } },
+        detailsResponse: { result: { local_key: 'localKey' } },
+        propertiesResponse: { result: { dps: { 1: true } } },
+        modelResponse: { result: { model: '{"services":[]}' } },
+        specifications: { details: 'specification' },
+        properties: { dps: { 1: true } },
+        thingModel: { services: [] },
+      }),
     });
 
     assert.callCount(tuyaHandler.connector.request, 4);
@@ -104,6 +184,18 @@ describe('TuyaHandler.loadDeviceDetails', () => {
       specifications: {},
       properties: { dps: { 1: true } },
       thing_model: { services: [] },
+      tuya_report: buildExpectedReport({
+        deviceId: 1,
+        listEntry: { id: 1 },
+        specificationResponse: null,
+        detailsResponse: { result: { local_key: 'localKey' } },
+        propertiesResponse: { result: { dps: { 1: true } } },
+        modelResponse: { result: { model: '{"services":[]}' } },
+        specificationError: 'spec failure',
+        specifications: {},
+        properties: { dps: { 1: true } },
+        thingModel: { services: [] },
+      }),
     });
     expect(warnStub.calledOnce).to.equal(true);
     expect(warnStub.firstCall.args[0]).to.match(/Failed to load specifications/);
@@ -129,6 +221,18 @@ describe('TuyaHandler.loadDeviceDetails', () => {
       specifications: { details: 'specification' },
       properties: { dps: { 1: true } },
       thing_model: { services: [] },
+      tuya_report: buildExpectedReport({
+        deviceId: 1,
+        listEntry: { id: 1 },
+        specificationResponse: { result: { details: 'specification' } },
+        detailsResponse: null,
+        propertiesResponse: { result: { dps: { 1: true } } },
+        modelResponse: { result: { model: '{"services":[]}' } },
+        detailsError: 'details failure',
+        specifications: { details: 'specification' },
+        properties: { dps: { 1: true } },
+        thingModel: { services: [] },
+      }),
     });
     expect(warnStub.calledOnce).to.equal(true);
     expect(warnStub.firstCall.args[0]).to.match(/Failed to load details/);
@@ -155,6 +259,19 @@ describe('TuyaHandler.loadDeviceDetails', () => {
       specifications: { details: 'specification' },
       properties: {},
       thing_model: null,
+      tuya_report: buildExpectedReport({
+        deviceId: 1,
+        listEntry: { id: 1 },
+        specificationResponse: { result: { details: 'specification' } },
+        detailsResponse: { result: { local_key: 'localKey' } },
+        propertiesResponse: null,
+        modelResponse: null,
+        propertiesError: 'props failure',
+        modelError: 'model failure',
+        specifications: { details: 'specification' },
+        properties: {},
+        thingModel: null,
+      }),
     });
     expect(warnStub.callCount).to.equal(2);
     expect(warnStub.firstCall.args[0]).to.match(/Failed to load properties/);
@@ -181,6 +298,17 @@ describe('TuyaHandler.loadDeviceDetails', () => {
       specifications: { details: 'specification' },
       properties: { dps: { 1: true } },
       thing_model: null,
+      tuya_report: buildExpectedReport({
+        deviceId: 1,
+        listEntry: { id: 1 },
+        specificationResponse: { result: { details: 'specification' } },
+        detailsResponse: { result: { local_key: 'localKey' } },
+        propertiesResponse: { result: { dps: { 1: true } } },
+        modelResponse: { result: { model: 'not-json' } },
+        specifications: { details: 'specification' },
+        properties: { dps: { 1: true } },
+        thingModel: null,
+      }),
     });
   });
 
@@ -204,6 +332,17 @@ describe('TuyaHandler.loadDeviceDetails', () => {
       specifications: { details: 'specification' },
       properties: { dps: { 1: true } },
       thing_model: { services: [] },
+      tuya_report: buildExpectedReport({
+        deviceId: 1,
+        listEntry: { id: 1 },
+        specificationResponse: { result: { details: 'specification' } },
+        detailsResponse: { result: { local_key: 'localKey' } },
+        propertiesResponse: { result: { dps: { 1: true } } },
+        modelResponse: { result: { services: [] } },
+        specifications: { details: 'specification' },
+        properties: { dps: { 1: true } },
+        thingModel: { services: [] },
+      }),
     });
   });
 
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index 6640af35dd..c910e19dd6 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -356,6 +356,29 @@ describe('TuyaHandler.updateDiscoveredDeviceAfterLocalPoll', () => {
           params: [],
           product_id: 'pid',
           product_key: 'pkey',
+          tuya_report: {
+            schema_version: 2,
+            cloud: {
+              assembled: {
+                specifications: null,
+                properties: null,
+                thing_model: null,
+              },
+              raw: {
+                device_list_entry: null,
+                device_specification: null,
+                device_details: null,
+                thing_shadow_properties: null,
+                thing_model: null,
+              },
+            },
+            local: {
+              scan: {
+                source: 'udp',
+                response: { ip: '9.9.9.9', version: '3.3' },
+              },
+            },
+          },
         },
       ],
     };
@@ -377,6 +400,10 @@ describe('TuyaHandler.updateDiscoveredDeviceAfterLocalPoll', () => {
     expect(findParam(DEVICE_PARAM_NAME.LOCAL_OVERRIDE).value).to.equal(true);
     expect(findParam(DEVICE_PARAM_NAME.PRODUCT_ID).value).to.equal('pid');
     expect(findParam(DEVICE_PARAM_NAME.PRODUCT_KEY).value).to.equal('pkey');
+    expect(updated.tuya_report.local.scan).to.deep.equal({
+      source: 'udp',
+      response: { ip: '9.9.9.9', version: '3.3' },
+    });
   });
 
   it('should merge when gladys stateManager exists', () => {
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index 0f0603083e..c7eecea7a7 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -2,6 +2,7 @@
 const sinon = require('sinon');
 const { expect } = require('chai');
 const proxyquire = require('proxyquire').noCallThru();
+const { mergeTuyaReport } = require('../../../../services/tuya/lib/utils/tuya.report');
 
 describe('TuyaHandler.localScan', () => {
   it('should return discovered devices from udp payload', async () => {
@@ -384,6 +385,10 @@ describe('TuyaHandler.buildLocalScanResponse', () => {
     expect(response.devices[0].ip).to.equal('1.1.1.1');
     const ipParam = response.devices[0].params.find((param) => param.name === 'IP_ADDRESS');
     expect(ipParam.value).to.equal('1.1.1.1');
+    expect(response.devices[0].tuya_report.local.scan).to.deep.equal({
+      source: 'udp',
+      response: { ip: '1.1.1.1', version: '3.3', productKey: 'pkey' },
+    });
   });
 
   it('should merge devices when gladys stateManager exists', () => {
@@ -423,6 +428,7 @@ describe('TuyaHandler.buildLocalScanResponse', () => {
         convertDevice: sinon.stub().callsFake((device) => ({
           external_id: `tuya:${device.id}`,
           params: [{ name: 'IP_ADDRESS', value: device.ip }],
+          tuya_report: mergeTuyaReport(null, device.tuya_report),
         })),
       },
     });
@@ -443,6 +449,29 @@ describe('TuyaHandler.buildLocalScanResponse', () => {
     expect(response.devices).to.have.length(1);
     expect(response.devices[0].external_id).to.equal('tuya:device2');
     expect(response.local_devices).to.deep.equal({ device2: { ip: '2.2.2.2', version: '3.3', productKey: 'pkey' } });
+    expect(response.devices[0].tuya_report).to.deep.equal({
+      schema_version: 2,
+      cloud: {
+        assembled: {
+          specifications: null,
+          properties: null,
+          thing_model: null,
+        },
+        raw: {
+          device_list_entry: null,
+          device_specification: null,
+          device_details: null,
+          thing_shadow_properties: null,
+          thing_model: null,
+        },
+      },
+      local: {
+        scan: {
+          source: 'udp',
+          response: { ip: '2.2.2.2', version: '3.3', productKey: 'pkey' },
+        },
+      },
+    });
   });
 
   it('should persist local-only devices when discoveredDevices is not an array', () => {
@@ -451,6 +480,7 @@ describe('TuyaHandler.buildLocalScanResponse', () => {
         convertDevice: sinon.stub().callsFake((device) => ({
           external_id: `tuya:${device.id}`,
           params: [{ name: 'IP_ADDRESS', value: device.ip }],
+          tuya_report: mergeTuyaReport(null, device.tuya_report),
         })),
       },
     });
@@ -471,5 +501,9 @@ describe('TuyaHandler.buildLocalScanResponse', () => {
     expect(response.devices).to.have.length(1);
     expect(tuyaManager.discoveredDevices).to.have.length(1);
     expect(tuyaManager.discoveredDevices[0].external_id).to.equal('tuya:device2');
+    expect(tuyaManager.discoveredDevices[0].tuya_report.local.scan).to.deep.equal({
+      source: 'udp',
+      response: { ip: '2.2.2.2', version: '3.3', productKey: 'pkey' },
+    });
   });
 });

From 33d861e58847d6a9c6d49ab0af12146594025d62 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 19:54:35 +0100
Subject: [PATCH 74/90] fix(tuya): refine unsupported cloud code detection

---
 .../all/tuya/commons/deviceHelpers.js         | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/commons/deviceHelpers.js b/front/src/routes/integration/all/tuya/commons/deviceHelpers.js
index d9b40b8b6e..fce215ca95 100644
--- a/front/src/routes/integration/all/tuya/commons/deviceHelpers.js
+++ b/front/src/routes/integration/all/tuya/commons/deviceHelpers.js
@@ -87,15 +87,36 @@ export const getUnknownSpecificationCodes = (specifications, features, device) =
     return [];
   }
   const knownCodes = new Set();
+  const addKnownCode = code => {
+    if (code !== null && code !== undefined) {
+      knownCodes.add(
+        String(code)
+          .trim()
+          .toLowerCase()
+      );
+    }
+  };
   if (Array.isArray(features)) {
     features.forEach(feature => {
       const parts = (feature.external_id || '').split(':');
-      const code = parts.length >= 3 ? parts[2] : null;
-      if (code) {
-        knownCodes.add(code.toLowerCase());
-      }
+      const code = parts.length >= 2 ? parts[parts.length - 1] : null;
+      addKnownCode(code);
     });
   }
+  const services = Array.isArray(device && device.thing_model && device.thing_model.services)
+    ? device.thing_model.services
+    : [];
+  services.forEach(service => {
+    const properties = Array.isArray(service && service.properties) ? service.properties : [];
+    properties.forEach(property => addKnownCode(property && property.code));
+  });
+  const propertiesPayload = device && device.properties;
+  const properties = Array.isArray(propertiesPayload)
+    ? propertiesPayload
+    : Array.isArray(propertiesPayload && propertiesPayload.properties)
+    ? propertiesPayload.properties
+    : [];
+  properties.forEach(property => addKnownCode(property && property.code));
   const specCodes = new Set();
   ['functions', 'status'].forEach(key => {
     const entries = specifications[key];
@@ -110,7 +131,9 @@ export const getUnknownSpecificationCodes = (specifications, features, device) =
   });
   const ignoredCodes = getIgnoredCloudCodes(device);
   return Array.from(specCodes).filter(code => {
-    const normalized = code.toLowerCase();
+    const normalized = String(code)
+      .trim()
+      .toLowerCase();
     return !knownCodes.has(normalized) && !ignoredCodes.has(normalized);
   });
 };

From b226e5d837702c8e65d0864ff7be09e58a4247f4 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 20:03:13 +0100
Subject: [PATCH 75/90] refactor(tuya): align frontend boolean helper imports

---
 front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx        | 2 +-
 front/src/routes/integration/all/tuya/commons/deviceHelpers.js | 3 ---
 front/src/routes/integration/all/tuya/commons/githubIssue.js   | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index a9711711f1..186334528c 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -6,8 +6,8 @@ import get from 'get-value';
 import DeviceFeatures from '../../../../components/device/view/DeviceFeatures';
 import { connect } from 'unistore/preact';
 import { RequestStatus } from '../../../../utils/consts';
+import { normalizeBoolean } from '../../../../../../server/services/tuya/lib/utils/tuya.normalize';
 import {
-  normalizeBoolean,
   buildParamsMap,
   getLocalPollDpsFromParams,
   getUnknownDpsKeys,
diff --git a/front/src/routes/integration/all/tuya/commons/deviceHelpers.js b/front/src/routes/integration/all/tuya/commons/deviceHelpers.js
index fce215ca95..a428c394de 100644
--- a/front/src/routes/integration/all/tuya/commons/deviceHelpers.js
+++ b/front/src/routes/integration/all/tuya/commons/deviceHelpers.js
@@ -3,9 +3,6 @@ const LOCAL_CODE_ALIASES = {
   power: ['switch']
 };
 
-export const normalizeBoolean = value =>
-  value === true || value === 1 || value === '1' || value === 'true' || value === 'TRUE';
-
 const getIgnoredLocalDps = device => {
   const mapping = device && device.tuya_mapping ? device.tuya_mapping : null;
   const ignored = mapping && Array.isArray(mapping.ignored_local_dps) ? mapping.ignored_local_dps : [];
diff --git a/front/src/routes/integration/all/tuya/commons/githubIssue.js b/front/src/routes/integration/all/tuya/commons/githubIssue.js
index 05b43afe61..9b77c5e082 100644
--- a/front/src/routes/integration/all/tuya/commons/githubIssue.js
+++ b/front/src/routes/integration/all/tuya/commons/githubIssue.js
@@ -1,6 +1,6 @@
 import get from 'get-value';
+import { normalizeBoolean } from '../../../../../../server/services/tuya/lib/utils/tuya.normalize';
 import {
-  normalizeBoolean,
   buildParamsMap,
   getParamValue,
   getLocalOverrideValue,

From 754dd357eb6366c161f0302ae62641c2124d0be1 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Sun, 1 Mar 2026 21:41:04 +0100
Subject: [PATCH 76/90] docs(tuya): clarify unsupported device onboarding
 guidance

---
 .../integration/all/tuya/TuyaDeviceBox.jsx    |  2 +-
 .../all/tuya/commons/deviceHelpers.js         |  3 +++
 .../all/tuya/commons/githubIssue.js           | 26 +++++++++++++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index 186334528c..a9711711f1 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -6,8 +6,8 @@ import get from 'get-value';
 import DeviceFeatures from '../../../../components/device/view/DeviceFeatures';
 import { connect } from 'unistore/preact';
 import { RequestStatus } from '../../../../utils/consts';
-import { normalizeBoolean } from '../../../../../../server/services/tuya/lib/utils/tuya.normalize';
 import {
+  normalizeBoolean,
   buildParamsMap,
   getLocalPollDpsFromParams,
   getUnknownDpsKeys,
diff --git a/front/src/routes/integration/all/tuya/commons/deviceHelpers.js b/front/src/routes/integration/all/tuya/commons/deviceHelpers.js
index a428c394de..fce215ca95 100644
--- a/front/src/routes/integration/all/tuya/commons/deviceHelpers.js
+++ b/front/src/routes/integration/all/tuya/commons/deviceHelpers.js
@@ -3,6 +3,9 @@ const LOCAL_CODE_ALIASES = {
   power: ['switch']
 };
 
+export const normalizeBoolean = value =>
+  value === true || value === 1 || value === '1' || value === 'true' || value === 'TRUE';
+
 const getIgnoredLocalDps = device => {
   const mapping = device && device.tuya_mapping ? device.tuya_mapping : null;
   const ignored = mapping && Array.isArray(mapping.ignored_local_dps) ? mapping.ignored_local_dps : [];
diff --git a/front/src/routes/integration/all/tuya/commons/githubIssue.js b/front/src/routes/integration/all/tuya/commons/githubIssue.js
index 9b77c5e082..f6e4e7ba12 100644
--- a/front/src/routes/integration/all/tuya/commons/githubIssue.js
+++ b/front/src/routes/integration/all/tuya/commons/githubIssue.js
@@ -1,6 +1,6 @@
 import get from 'get-value';
-import { normalizeBoolean } from '../../../../../../server/services/tuya/lib/utils/tuya.normalize';
 import {
+  normalizeBoolean,
   buildParamsMap,
   getParamValue,
   getLocalOverrideValue,
@@ -398,6 +398,9 @@ const buildIssueBody = (device, localPollStatus, localPollError, localPollValida
     '',
     'These expected files should still be reviewed and created manually.',
     '',
+    '`poll-device.json` is only a starting point based on the current support level in Gladys.',
+    'After adding or updating mappings, it should be completed with the final supported features and mapping metadata.',
+    '',
     '## Data Coverage',
     '',
     '- `GET /v1.0/users/{sourceId}/devices` -> `Device List Entry` below',
@@ -427,7 +430,12 @@ const buildIssueBody = (device, localPollStatus, localPollError, localPollValida
     '',
     '## Suggested File: poll-device.json',
     '',
-    'Use this as the base Gladys device for cloud/local poll tests.',
+    'Use this as a base Gladys device for cloud/local poll tests.',
+    '',
+    'Important:',
+    '- this file reflects the support level available when the issue was created',
+    '- after implementing support in mappings, update `device_type`, `features`, and `tuya_mapping` to match the final Gladys support',
+    '- if the final support changes significantly, prefer rebuilding this file from the resulting converted device',
     '',
     toCodeBlock('json', pollDevice),
     '',
@@ -476,6 +484,14 @@ const buildIssueBody = (device, localPollStatus, localPollError, localPollValida
     '',
     toCodeBlock('json', supplementalDiagnostics),
     '',
+    '## Mapping Work Required',
+    '',
+    'If this device needs new support in Gladys, the maintainer will usually need to:',
+    '- create or update a cloud mapping file in `server/services/tuya/lib/mappings/cloud/`',
+    '- create or update a local mapping file in `server/services/tuya/lib/mappings/local/`',
+    '- register the mapping in `server/services/tuya/lib/mappings/index.js`',
+    '- re-run conversion and polling expectations after the mapping changes',
+    '',
     'Note:',
     '',
     '- The raw `thing_model.response.result.model` string is intentionally omitted here because it is already represented in a readable object form in `input-device.json > thing_model`.',
@@ -485,6 +501,9 @@ const buildIssueBody = (device, localPollStatus, localPollError, localPollValida
     toCodeBlock(
       'text',
       [
+        'mapping file(s) in `server/services/tuya/lib/mappings/cloud/` and/or `server/services/tuya/lib/mappings/local/`',
+        '`server/services/tuya/lib/mappings/index.js`',
+        'poll-device.json (completed with final supported features)',
         'expected-device.json',
         'expected-cloud-events.json',
         'expected-local-events.json',
@@ -495,6 +514,9 @@ const buildIssueBody = (device, localPollStatus, localPollError, localPollValida
     '## Validation Checklist',
     '',
     '- Confirm the inferred `device_type`',
+    '- Create or update the mapping files in `server/services/tuya/lib/mappings/cloud/` and/or `server/services/tuya/lib/mappings/local/`',
+    '- Register the mapping in `server/services/tuya/lib/mappings/index.js`',
+    '- Rebuild `poll-device.json` so it matches the final supported Gladys features',
     '- Confirm the expected Gladys features',
     '- Confirm cloud polling behavior',
     '- Confirm local polling behavior',

From 85f643c321d74ce63923a08c20bdd949f73b8779 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Mon, 2 Mar 2026 00:10:22 +0100
Subject: [PATCH 77/90] test(tuya): align smart meter fixtures with issue
 captures

---
 .../cloud-status.json                         |  31 +-
 .../expected-cloud-events.json                |  26 -
 .../expected-device.json                      | 136 +++-
 .../expected-events.json                      |  50 ++
 .../expected-local-events.json                |  26 -
 .../expected-local-mapping.json               |  10 +-
 .../input-device.json                         | 692 +++++++++++++++++-
 .../local-dps.json                            |  31 +-
 .../smart-meter-bbcg1hrkrj5rifsd/manifest.js  |   6 +-
 .../poll-device.json                          | 126 +++-
 .../tuya.convertDevice.fixtures.test.js       |  78 ++
 .../tuya/lib/tuya.poll.fixtures.test.js       |  56 ++
 12 files changed, 1144 insertions(+), 124 deletions(-)
 delete mode 100644 server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-cloud-events.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-events.json
 delete mode 100644 server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-events.json

diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/cloud-status.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/cloud-status.json
index 518e38760c..0e0e2f72dd 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/cloud-status.json
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/cloud-status.json
@@ -1,10 +1,35 @@
 {
   "result": [
+    { "code": "power_a", "value": 706 },
+    { "code": "direction_a", "value": "FORWARD" },
+    { "code": "tbd", "value": false },
+    { "code": "direction_b", "value": "REVERSE" },
+    { "code": "power_b", "value": 0 },
+    { "code": "energy_forword_a", "value": 149241 },
+    { "code": "energy_reverse_a", "value": 43222 },
+    { "code": "energy_forword_b", "value": 0 },
+    { "code": "energy_reserse_b", "value": 0 },
+    { "code": "power_factor", "value": 73 },
+    { "code": "freq", "value": 4927 },
+    { "code": "voltage_a", "value": 2352 },
+    { "code": "current_a", "value": 410 },
+    { "code": "current_b", "value": 0 },
     { "code": "total_power", "value": 706 },
+    { "code": "voltage_coef", "value": 1000 },
+    { "code": "current_a_calibration", "value": 1000 },
+    { "code": "power_a_calibration", "value": 1000 },
+    { "code": "energy_a_calibration_fwd", "value": 1000 },
+    { "code": "coef_a_reset", "value": false },
+    { "code": "power_factor_b", "value": 100 },
+    { "code": "freq_calibration", "value": 1000 },
+    { "code": "current_b_calibration", "value": 1000 },
+    { "code": "power_b_calibration", "value": 1000 },
+    { "code": "energy_b_calibration_fwd", "value": 1000 },
+    { "code": "coef_b_reset", "value": false },
+    { "code": "energy_a_calibration_rev", "value": 1000 },
+    { "code": "energy_b_calibration_rev", "value": 1000 },
+    { "code": "report_rate_control", "value": 10 },
     { "code": "forward_energy_total", "value": 149241 },
-    { "code": "voltage_a", "value": 2301 },
-    { "code": "current_a", "value": 123 },
-    { "code": "current_b", "value": 456 },
     { "code": "reverse_energy_total", "value": 43222 }
   ]
 }
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-cloud-events.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-cloud-events.json
deleted file mode 100644
index 00f85006e6..0000000000
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-cloud-events.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "device_feature_external_id": "tuya:smart-meter-device-id:total_power",
-    "state": 70.6
-  },
-  {
-    "device_feature_external_id": "tuya:smart-meter-device-id:forward_energy_total",
-    "state": 1492.41
-  },
-  {
-    "device_feature_external_id": "tuya:smart-meter-device-id:voltage_a",
-    "state": 230.1
-  },
-  {
-    "device_feature_external_id": "tuya:smart-meter-device-id:current_a",
-    "state": 123
-  },
-  {
-    "device_feature_external_id": "tuya:smart-meter-device-id:current_b",
-    "state": 456
-  },
-  {
-    "device_feature_external_id": "tuya:smart-meter-device-id:reverse_energy_total",
-    "state": 432.22
-  }
-]
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
index 75f62e205e..06c4e87b8b 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
@@ -5,11 +5,15 @@
   "device_type": "smart-meter",
   "model": "Smart Meter",
   "product_id": "bbcg1hrkrj5rifsd",
+  "product_key": null,
   "online": true,
   "poll_frequency": 10000,
   "should_poll": true,
   "params": {
     "DEVICE_ID": "smart-meter-device-id",
+    "LOCAL_KEY": "local-key",
+    "IP_ADDRESS": "10.0.0.20",
+    "CLOUD_IP": "82.0.0.10",
     "LOCAL_OVERRIDE": true,
     "PROTOCOL_VERSION": "3.3",
     "PRODUCT_ID": "bbcg1hrkrj5rifsd"
@@ -59,24 +63,24 @@
   },
   "features": [
     {
-      "name": "total_power",
-      "external_id": "tuya:smart-meter-device-id:total_power",
-      "selector": "tuya:smart-meter-device-id:total_power",
-      "category": "energy-sensor",
-      "type": "power",
+      "name": "energy_reserse_b",
+      "external_id": "tuya:smart-meter-device-id:energy_reserse_b",
+      "selector": "tuya:smart-meter-device-id:energy_reserse_b",
+      "category": "energy-production-sensor",
+      "type": "index",
       "read_only": true,
       "has_feedback": false,
-      "min": -99999999,
+      "min": 0,
       "max": 99999999,
-      "unit": "watt",
-      "scale": 1
+      "unit": "kilowatt-hour",
+      "scale": 2
     },
     {
-      "name": "forward_energy_total",
-      "external_id": "tuya:smart-meter-device-id:forward_energy_total",
-      "selector": "tuya:smart-meter-device-id:forward_energy_total",
-      "category": "energy-sensor",
-      "type": "energy",
+      "name": "energy_reverse_a",
+      "external_id": "tuya:smart-meter-device-id:energy_reverse_a",
+      "selector": "tuya:smart-meter-device-id:energy_reverse_a",
+      "category": "energy-production-sensor",
+      "type": "index",
       "read_only": true,
       "has_feedback": false,
       "min": 0,
@@ -85,17 +89,17 @@
       "scale": 2
     },
     {
-      "name": "voltage_a",
-      "external_id": "tuya:smart-meter-device-id:voltage_a",
-      "selector": "tuya:smart-meter-device-id:voltage_a",
-      "category": "energy-sensor",
-      "type": "voltage",
+      "name": "reverse_energy_total",
+      "external_id": "tuya:smart-meter-device-id:reverse_energy_total",
+      "selector": "tuya:smart-meter-device-id:reverse_energy_total",
+      "category": "energy-production-sensor",
+      "type": "index",
       "read_only": true,
       "has_feedback": false,
       "min": 0,
       "max": 99999999,
-      "unit": "volt",
-      "scale": 1
+      "unit": "kilowatt-hour",
+      "scale": 2
     },
     {
       "name": "current_a",
@@ -106,7 +110,7 @@
       "read_only": true,
       "has_feedback": false,
       "min": 0,
-      "max": 99999999,
+      "max": 1000000,
       "unit": "milliampere",
       "scale": 0
     },
@@ -119,22 +123,100 @@
       "read_only": true,
       "has_feedback": false,
       "min": 0,
-      "max": 99999999,
+      "max": 1000000,
       "unit": "milliampere",
       "scale": 0
     },
     {
-      "name": "reverse_energy_total",
-      "external_id": "tuya:smart-meter-device-id:reverse_energy_total",
-      "selector": "tuya:smart-meter-device-id:reverse_energy_total",
-      "category": "energy-production-sensor",
-      "type": "index",
+      "name": "energy_forword_a",
+      "external_id": "tuya:smart-meter-device-id:energy_forword_a",
+      "selector": "tuya:smart-meter-device-id:energy_forword_a",
+      "category": "energy-sensor",
+      "type": "energy",
       "read_only": true,
       "has_feedback": false,
       "min": 0,
       "max": 99999999,
       "unit": "kilowatt-hour",
       "scale": 2
+    },
+    {
+      "name": "energy_forword_b",
+      "external_id": "tuya:smart-meter-device-id:energy_forword_b",
+      "selector": "tuya:smart-meter-device-id:energy_forword_b",
+      "category": "energy-sensor",
+      "type": "energy",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 99999999,
+      "unit": "kilowatt-hour",
+      "scale": 2
+    },
+    {
+      "name": "forward_energy_total",
+      "external_id": "tuya:smart-meter-device-id:forward_energy_total",
+      "selector": "tuya:smart-meter-device-id:forward_energy_total",
+      "category": "energy-sensor",
+      "type": "energy",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 99999999,
+      "unit": "kilowatt-hour",
+      "scale": 2
+    },
+    {
+      "name": "power_a",
+      "external_id": "tuya:smart-meter-device-id:power_a",
+      "selector": "tuya:smart-meter-device-id:power_a",
+      "category": "energy-sensor",
+      "type": "power",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 600000,
+      "unit": "watt",
+      "scale": 1
+    },
+    {
+      "name": "power_b",
+      "external_id": "tuya:smart-meter-device-id:power_b",
+      "selector": "tuya:smart-meter-device-id:power_b",
+      "category": "energy-sensor",
+      "type": "power",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 600000,
+      "unit": "watt",
+      "scale": 1
+    },
+    {
+      "name": "total_power",
+      "external_id": "tuya:smart-meter-device-id:total_power",
+      "selector": "tuya:smart-meter-device-id:total_power",
+      "category": "energy-sensor",
+      "type": "power",
+      "read_only": true,
+      "has_feedback": false,
+      "min": -99999999,
+      "max": 99999999,
+      "unit": "watt",
+      "scale": 1
+    },
+    {
+      "name": "voltage_a",
+      "external_id": "tuya:smart-meter-device-id:voltage_a",
+      "selector": "tuya:smart-meter-device-id:voltage_a",
+      "category": "energy-sensor",
+      "type": "voltage",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 28000,
+      "unit": "volt",
+      "scale": 1
     }
   ]
 }
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-events.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-events.json
new file mode 100644
index 0000000000..8548b21e72
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-events.json
@@ -0,0 +1,50 @@
+[
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:current_a",
+    "state": 410
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:current_b",
+    "state": 0
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:energy_forword_a",
+    "state": 1492.41
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:energy_forword_b",
+    "state": 0
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:energy_reserse_b",
+    "state": 0
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:energy_reverse_a",
+    "state": 432.22
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:forward_energy_total",
+    "state": 1492.41
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:power_a",
+    "state": 70.6
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:power_b",
+    "state": 0
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:reverse_energy_total",
+    "state": 432.22
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:total_power",
+    "state": 70.6
+  },
+  {
+    "device_feature_external_id": "tuya:smart-meter-device-id:voltage_a",
+    "state": 235.2
+  }
+]
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-events.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-events.json
deleted file mode 100644
index 00f85006e6..0000000000
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-events.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "device_feature_external_id": "tuya:smart-meter-device-id:total_power",
-    "state": 70.6
-  },
-  {
-    "device_feature_external_id": "tuya:smart-meter-device-id:forward_energy_total",
-    "state": 1492.41
-  },
-  {
-    "device_feature_external_id": "tuya:smart-meter-device-id:voltage_a",
-    "state": 230.1
-  },
-  {
-    "device_feature_external_id": "tuya:smart-meter-device-id:current_a",
-    "state": 123
-  },
-  {
-    "device_feature_external_id": "tuya:smart-meter-device-id:current_b",
-    "state": 456
-  },
-  {
-    "device_feature_external_id": "tuya:smart-meter-device-id:reverse_energy_total",
-    "state": 432.22
-  }
-]
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-mapping.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-mapping.json
index ed48876631..5a1275abde 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-mapping.json
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-local-mapping.json
@@ -1,8 +1,14 @@
 {
-  "total_power": 115,
-  "forward_energy_total": 130,
+  "power_a": 101,
+  "power_b": 105,
+  "energy_forword_a": 106,
+  "energy_reverse_a": 107,
+  "energy_forword_b": 108,
+  "energy_reserse_b": 109,
   "voltage_a": 112,
   "current_a": 113,
   "current_b": 114,
+  "total_power": 115,
+  "forward_energy_total": 130,
   "reverse_energy_total": 131
 }
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/input-device.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/input-device.json
index a80d8a55d5..420f19217f 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/input-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/input-device.json
@@ -1,100 +1,756 @@
 {
   "id": "smart-meter-device-id",
   "name": "Production solaire",
+  "selector": "tuya-bf8a5bf8acc4540a41rere",
+  "product_name": "Smart Meter",
   "model": "Smart Meter",
+  "external_id": "tuya:bf8a5bf8acc4540a41rere",
+  "service_id": "966ff9b2-7d5d-4c88-aa54-80c406d5743d",
   "product_id": "bbcg1hrkrj5rifsd",
+  "product_key": null,
+  "online": true,
   "protocol_version": "3.3",
+  "local_key": "local-key",
+  "ip": "10.0.0.20",
+  "cloud_ip": "82.0.0.10",
   "local_override": true,
-  "online": true,
   "specifications": {},
   "properties": {
     "properties": [
+      {
+        "code": "power_a",
+        "custom_name": "",
+        "dp_id": 101,
+        "time": 1771951460001,
+        "type": "value",
+        "value": 706
+      },
+      {
+        "code": "direction_a",
+        "custom_name": "",
+        "dp_id": 102,
+        "time": 1771951348019,
+        "type": "enum",
+        "value": "FORWARD"
+      },
+      {
+        "code": "tbd",
+        "custom_name": "",
+        "dp_id": 103,
+        "time": 1743762507831,
+        "type": "bool",
+        "value": false
+      },
+      {
+        "code": "direction_b",
+        "custom_name": "",
+        "dp_id": 104,
+        "time": 1743767172287,
+        "type": "enum",
+        "value": "REVERSE"
+      },
+      {
+        "code": "power_b",
+        "custom_name": "",
+        "dp_id": 105,
+        "time": 1771951348019,
+        "type": "value",
+        "value": 0
+      },
+      {
+        "code": "energy_forword_a",
+        "custom_name": "",
+        "dp_id": 106,
+        "time": 1771951345936,
+        "type": "value",
+        "value": 149241
+      },
+      {
+        "code": "energy_reverse_a",
+        "custom_name": "",
+        "dp_id": 107,
+        "time": 1771951348019,
+        "type": "value",
+        "value": 43222
+      },
+      {
+        "code": "energy_forword_b",
+        "custom_name": "",
+        "dp_id": 108,
+        "time": 1771951348019,
+        "type": "value",
+        "value": 0
+      },
+      {
+        "code": "energy_reserse_b",
+        "custom_name": "",
+        "dp_id": 109,
+        "time": 1771951348019,
+        "type": "value",
+        "value": 0
+      },
+      {
+        "code": "power_factor",
+        "custom_name": "",
+        "dp_id": 110,
+        "time": 1771951438623,
+        "type": "value",
+        "value": 73
+      },
+      {
+        "code": "freq",
+        "custom_name": "",
+        "dp_id": 111,
+        "time": 1771951449324,
+        "type": "value",
+        "value": 4927
+      },
+      {
+        "code": "voltage_a",
+        "custom_name": "",
+        "dp_id": 112,
+        "time": 1771951459889,
+        "type": "value",
+        "value": 2352
+      },
+      {
+        "code": "current_a",
+        "custom_name": "",
+        "dp_id": 113,
+        "time": 1771951449206,
+        "type": "value",
+        "value": 410
+      },
+      {
+        "code": "current_b",
+        "custom_name": "",
+        "dp_id": 114,
+        "time": 1771951348019,
+        "type": "value",
+        "value": 0
+      },
       {
         "code": "total_power",
+        "custom_name": "",
         "dp_id": 115,
+        "time": 1771951460016,
         "type": "value",
         "value": 706
+      },
+      {
+        "code": "voltage_coef",
+        "custom_name": "",
+        "dp_id": 116,
+        "time": 1771951345564,
+        "type": "value",
+        "value": 1000
+      },
+      {
+        "code": "current_a_calibration",
+        "custom_name": "",
+        "dp_id": 117,
+        "time": 1771951345590,
+        "type": "value",
+        "value": 1000
+      },
+      {
+        "code": "power_a_calibration",
+        "custom_name": "",
+        "dp_id": 118,
+        "time": 1771951345699,
+        "type": "value",
+        "value": 1000
+      },
+      {
+        "code": "energy_a_calibration_fwd",
+        "custom_name": "",
+        "dp_id": 119,
+        "time": 1771951345718,
+        "type": "value",
+        "value": 1000
+      },
+      {
+        "code": "coef_a_reset",
+        "custom_name": "",
+        "dp_id": 120,
+        "time": 1743762507831,
+        "type": "bool",
+        "value": false
+      },
+      {
+        "code": "power_factor_b",
+        "custom_name": "",
+        "dp_id": 121,
+        "time": 1771951348019,
+        "type": "value",
+        "value": 100
+      },
+      {
+        "code": "freq_calibration",
+        "custom_name": "",
+        "dp_id": 122,
+        "time": 1771951345575,
+        "type": "value",
+        "value": 1000
+      },
+      {
+        "code": "current_b_calibration",
+        "custom_name": "",
+        "dp_id": 123,
+        "time": 1771951345731,
+        "type": "value",
+        "value": 1000
+      },
+      {
+        "code": "power_b_calibration",
+        "custom_name": "",
+        "dp_id": 124,
+        "time": 1771951345761,
+        "type": "value",
+        "value": 1000
+      },
+      {
+        "code": "energy_b_calibration_fwd",
+        "custom_name": "",
+        "dp_id": 125,
+        "time": 1771951348019,
+        "type": "value",
+        "value": 1000
+      },
+      {
+        "code": "coef_b_reset",
+        "custom_name": "",
+        "dp_id": 126,
+        "time": 1743762507831,
+        "type": "bool",
+        "value": false
+      },
+      {
+        "code": "energy_a_calibration_rev",
+        "custom_name": "",
+        "dp_id": 127,
+        "time": 1771951345723,
+        "type": "value",
+        "value": 1000
+      },
+      {
+        "code": "energy_b_calibration_rev",
+        "custom_name": "",
+        "dp_id": 128,
+        "time": 1771951345905,
+        "type": "value",
+        "value": 1000
+      },
+      {
+        "code": "report_rate_control",
+        "custom_name": "",
+        "dp_id": 129,
+        "time": 1771951345921,
+        "type": "value",
+        "value": 10
+      },
+      {
+        "code": "forward_energy_total",
+        "custom_name": "",
+        "dp_id": 130,
+        "time": 1771951345925,
+        "type": "value",
+        "value": 149241
+      },
+      {
+        "code": "reverse_energy_total",
+        "custom_name": "",
+        "dp_id": 131,
+        "time": 1771951348019,
+        "type": "value",
+        "value": 43222
       }
     ]
   },
   "thing_model": {
+    "modelId": "flu1ic",
     "services": [
       {
+        "actions": [],
+        "code": "",
+        "description": "",
+        "events": [],
+        "name": "默认服务",
         "properties": [
           {
-            "code": "total_power",
-            "name": "Total_Power",
+            "abilityId": 101,
             "accessMode": "ro",
+            "code": "power_a",
+            "description": "",
+            "name": "Power_a",
             "typeSpec": {
               "type": "value",
-              "min": -99999999,
-              "max": 99999999,
+              "max": 600000,
+              "min": 0,
               "scale": 1,
+              "step": 1,
               "unit": "W"
             }
           },
           {
-            "code": "forward_energy_total",
-            "name": "Forward Energy Total",
+            "abilityId": 102,
+            "accessMode": "ro",
+            "code": "direction_a",
+            "description": "",
+            "name": "Current_Flow_A",
+            "typeSpec": {
+              "type": "enum",
+              "range": ["FORWARD", "REVERSE"]
+            }
+          },
+          {
+            "abilityId": 103,
+            "accessMode": "ro",
+            "code": "tbd",
+            "description": "",
+            "name": "TBD",
+            "typeSpec": {
+              "type": "bool"
+            }
+          },
+          {
+            "abilityId": 104,
+            "accessMode": "ro",
+            "code": "direction_b",
+            "description": "",
+            "name": "Current_FLow_B",
+            "typeSpec": {
+              "type": "enum",
+              "range": ["FORWARD", "REVERSE"]
+            }
+          },
+          {
+            "abilityId": 105,
             "accessMode": "ro",
+            "code": "power_b",
+            "description": "",
+            "name": "Power_b",
             "typeSpec": {
               "type": "value",
+              "max": 600000,
               "min": 0,
+              "scale": 1,
+              "step": 1,
+              "unit": "W"
+            }
+          },
+          {
+            "abilityId": 106,
+            "accessMode": "ro",
+            "code": "energy_forword_a",
+            "description": "",
+            "name": "Forward Energy-A",
+            "typeSpec": {
+              "type": "value",
               "max": 99999999,
+              "min": 0,
               "scale": 2,
+              "step": 1,
               "unit": "KWH"
             }
           },
           {
-            "code": "reverse_energy_total",
-            "name": "Reverse Energy Total",
+            "abilityId": 107,
             "accessMode": "ro",
+            "code": "energy_reverse_a",
+            "description": "",
+            "name": "Reverse Energy-A",
             "typeSpec": {
               "type": "value",
-              "min": 0,
               "max": 99999999,
+              "min": 0,
               "scale": 2,
+              "step": 1,
               "unit": "KWH"
             }
           },
           {
-            "code": "voltage_a",
-            "name": "Voltage A",
+            "abilityId": 108,
             "accessMode": "ro",
+            "code": "energy_forword_b",
+            "description": "",
+            "name": "Forward Energy-B",
             "typeSpec": {
               "type": "value",
+              "max": 99999999,
               "min": 0,
+              "scale": 2,
+              "step": 1,
+              "unit": "KWH"
+            }
+          },
+          {
+            "abilityId": 109,
+            "accessMode": "ro",
+            "code": "energy_reserse_b",
+            "description": "",
+            "name": "Reverse Energy-B",
+            "typeSpec": {
+              "type": "value",
               "max": 99999999,
+              "min": 0,
+              "scale": 2,
+              "step": 1,
+              "unit": "KWH"
+            }
+          },
+          {
+            "abilityId": 110,
+            "accessMode": "ro",
+            "code": "power_factor",
+            "description": "",
+            "name": "Power_factor",
+            "typeSpec": {
+              "type": "value",
+              "max": 100,
+              "min": 0,
+              "scale": 2,
+              "step": 1,
+              "unit": ""
+            }
+          },
+          {
+            "abilityId": 111,
+            "accessMode": "ro",
+            "code": "freq",
+            "description": "",
+            "name": "AC_Freq",
+            "typeSpec": {
+              "type": "value",
+              "max": 10000,
+              "min": 0,
+              "scale": 2,
+              "step": 1,
+              "unit": "Hz"
+            }
+          },
+          {
+            "abilityId": 112,
+            "accessMode": "ro",
+            "code": "voltage_a",
+            "description": "",
+            "name": "Voltage",
+            "typeSpec": {
+              "type": "value",
+              "max": 28000,
+              "min": 0,
               "scale": 1,
+              "step": 1,
               "unit": "V"
             }
           },
           {
-            "code": "current_a",
-            "name": "Current A",
+            "abilityId": 113,
             "accessMode": "ro",
+            "code": "current_a",
+            "description": "",
+            "name": "Current_a",
             "typeSpec": {
               "type": "value",
+              "max": 1000000,
               "min": 0,
-              "max": 99999999,
               "scale": 0,
+              "step": 1,
               "unit": "mA"
             }
           },
           {
-            "code": "current_b",
-            "name": "Current B",
+            "abilityId": 114,
             "accessMode": "ro",
+            "code": "current_b",
+            "description": "",
+            "name": "Current_b",
             "typeSpec": {
               "type": "value",
+              "max": 1000000,
               "min": 0,
-              "max": 99999999,
               "scale": 0,
+              "step": 1,
               "unit": "mA"
             }
+          },
+          {
+            "abilityId": 115,
+            "accessMode": "ro",
+            "code": "total_power",
+            "description": "",
+            "name": " Total_Power",
+            "typeSpec": {
+              "type": "value",
+              "max": 99999999,
+              "min": -99999999,
+              "scale": 1,
+              "step": 1,
+              "unit": "W"
+            }
+          },
+          {
+            "abilityId": 116,
+            "accessMode": "rw",
+            "code": "voltage_coef",
+            "description": "",
+            "name": "电压校准",
+            "typeSpec": {
+              "type": "value",
+              "max": 1200,
+              "min": 800,
+              "scale": 3,
+              "step": 1,
+              "unit": ""
+            }
+          },
+          {
+            "abilityId": 117,
+            "accessMode": "rw",
+            "code": "current_a_calibration",
+            "description": "",
+            "name": "current_a_calibration",
+            "typeSpec": {
+              "type": "value",
+              "max": 1200,
+              "min": 800,
+              "scale": 3,
+              "step": 1,
+              "unit": ""
+            }
+          },
+          {
+            "abilityId": 118,
+            "accessMode": "rw",
+            "code": "power_a_calibration",
+            "description": "",
+            "name": "power_a_calibration",
+            "typeSpec": {
+              "type": "value",
+              "max": 1200,
+              "min": 800,
+              "scale": 3,
+              "step": 1,
+              "unit": ""
+            }
+          },
+          {
+            "abilityId": 119,
+            "accessMode": "rw",
+            "code": "energy_a_calibration_fwd",
+            "description": "",
+            "name": "energy_a_calibration_fwd",
+            "typeSpec": {
+              "type": "value",
+              "max": 1200,
+              "min": 800,
+              "scale": 3,
+              "step": 1,
+              "unit": ""
+            }
+          },
+          {
+            "abilityId": 120,
+            "accessMode": "wr",
+            "code": "coef_a_reset",
+            "description": "",
+            "name": "coef_a_reset",
+            "typeSpec": {
+              "type": "bool"
+            }
+          },
+          {
+            "abilityId": 121,
+            "accessMode": "ro",
+            "code": "power_factor_b",
+            "description": "",
+            "name": "Power_factor_b",
+            "typeSpec": {
+              "type": "value",
+              "max": 100,
+              "min": 0,
+              "scale": 2,
+              "step": 1,
+              "unit": ""
+            }
+          },
+          {
+            "abilityId": 122,
+            "accessMode": "rw",
+            "code": "freq_calibration",
+            "description": "",
+            "name": "频率校准",
+            "typeSpec": {
+              "type": "value",
+              "max": 1200,
+              "min": 800,
+              "scale": 3,
+              "step": 1,
+              "unit": ""
+            }
+          },
+          {
+            "abilityId": 123,
+            "accessMode": "rw",
+            "code": "current_b_calibration",
+            "description": "",
+            "name": "current_b_calibration",
+            "typeSpec": {
+              "type": "value",
+              "max": 1200,
+              "min": 800,
+              "scale": 3,
+              "step": 1,
+              "unit": ""
+            }
+          },
+          {
+            "abilityId": 124,
+            "accessMode": "rw",
+            "code": "power_b_calibration",
+            "description": "",
+            "name": "power_b_calibration",
+            "typeSpec": {
+              "type": "value",
+              "max": 1200,
+              "min": 800,
+              "scale": 3,
+              "step": 1,
+              "unit": ""
+            }
+          },
+          {
+            "abilityId": 125,
+            "accessMode": "rw",
+            "code": "energy_b_calibration_fwd",
+            "description": "",
+            "name": "energy_b_calibration_fwd",
+            "typeSpec": {
+              "type": "value",
+              "max": 1200,
+              "min": 800,
+              "scale": 3,
+              "step": 1,
+              "unit": ""
+            }
+          },
+          {
+            "abilityId": 126,
+            "accessMode": "wr",
+            "code": "coef_b_reset",
+            "description": "",
+            "name": "coef_b_reset",
+            "typeSpec": {
+              "type": "bool"
+            }
+          },
+          {
+            "abilityId": 127,
+            "accessMode": "rw",
+            "code": "energy_a_calibration_rev",
+            "description": "",
+            "name": "energy_a_calibration_rev",
+            "typeSpec": {
+              "type": "value",
+              "max": 1200,
+              "min": 800,
+              "scale": 3,
+              "step": 1,
+              "unit": ""
+            }
+          },
+          {
+            "abilityId": 128,
+            "accessMode": "rw",
+            "code": "energy_b_calibration_rev",
+            "description": "",
+            "name": "energy_b_calibration_rev",
+            "typeSpec": {
+              "type": "value",
+              "max": 1200,
+              "min": 800,
+              "scale": 3,
+              "step": 1,
+              "unit": ""
+            }
+          },
+          {
+            "abilityId": 129,
+            "accessMode": "rw",
+            "code": "report_rate_control",
+            "description": "",
+            "name": "上报频率",
+            "typeSpec": {
+              "type": "value",
+              "max": 60,
+              "min": 3,
+              "scale": 0,
+              "step": 1,
+              "unit": "s"
+            }
+          },
+          {
+            "abilityId": 130,
+            "accessMode": "ro",
+            "code": "forward_energy_total",
+            "description": "",
+            "name": "forward_energy_total",
+            "typeSpec": {
+              "type": "value",
+              "max": 99999999,
+              "min": 0,
+              "scale": 2,
+              "step": 1,
+              "unit": "KWH"
+            }
+          },
+          {
+            "abilityId": 131,
+            "accessMode": "ro",
+            "code": "reverse_energy_total",
+            "description": "",
+            "name": "reverse_energy_total",
+            "typeSpec": {
+              "type": "value",
+              "max": 99999999,
+              "min": 0,
+              "scale": 2,
+              "step": 1,
+              "unit": "KWH"
+            }
           }
         ]
       }
     ]
+  },
+  "thing_model_raw": "{\"modelId\":\"flu1ic\",\"services\":[{\"actions\":[],\"code\":\"\",\"description\":\"\",\"events\":[],\"name\":\"默认服务\",\"properties\":[{\"abilityId\":101,\"accessMode\":\"ro\",\"code\":\"power_a\",\"description\":\"\",\"name\":\"Power_a\",\"typeSpec\":{\"type\":\"value\",\"max\":600000,\"min\":0,\"scale\":1,\"step\":1,\"unit\":\"W\"}},{\"abilityId\":102,\"accessMode\":\"ro\",\"code\":\"direction_a\",\"description\":\"\",\"name\":\"Current_Flow_A\",\"typeSpec\":{\"type\":\"enum\",\"range\":[\"FORWARD\",\"REVERSE\"]}},{\"abilityId\":103,\"accessMode\":\"ro\",\"code\":\"tbd\",\"description\":\"\",\"name\":\"TBD\",\"typeSpec\":{\"type\":\"bool\"}},{\"abilityId\":104,\"accessMode\":\"ro\",\"code\":\"direction_b\",\"description\":\"\",\"name\":\"Current_FLow_B\",\"typeSpec\":{\"type\":\"enum\",\"range\":[\"FORWARD\",\"REVERSE\"]}},{\"abilityId\":105,\"accessMode\":\"ro\",\"code\":\"power_b\",\"description\":\"\",\"name\":\"Power_b\",\"typeSpec\":{\"type\":\"value\",\"max\":600000,\"min\":0,\"scale\":1,\"step\":1,\"unit\":\"W\"}},{\"abilityId\":106,\"accessMode\":\"ro\",\"code\":\"energy_forword_a\",\"description\":\"\",\"name\":\"Forward Energy-A\",\"typeSpec\":{\"type\":\"value\",\"max\":99999999,\"min\":0,\"scale\":2,\"step\":1,\"unit\":\"KWH\"}},{\"abilityId\":107,\"accessMode\":\"ro\",\"code\":\"energy_reverse_a\",\"description\":\"\",\"name\":\"Reverse Energy-A\",\"typeSpec\":{\"type\":\"value\",\"max\":99999999,\"min\":0,\"scale\":2,\"step\":1,\"unit\":\"KWH\"}},{\"abilityId\":108,\"accessMode\":\"ro\",\"code\":\"energy_forword_b\",\"description\":\"\",\"name\":\"Forward Energy-B\",\"typeSpec\":{\"type\":\"value\",\"max\":99999999,\"min\":0,\"scale\":2,\"step\":1,\"unit\":\"KWH\"}},{\"abilityId\":109,\"accessMode\":\"ro\",\"code\":\"energy_reserse_b\",\"description\":\"\",\"name\":\"Reverse Energy-B\",\"typeSpec\":{\"type\":\"value\",\"max\":99999999,\"min\":0,\"scale\":2,\"step\":1,\"unit\":\"KWH\"}},{\"abilityId\":110,\"accessMode\":\"ro\",\"code\":\"power_factor\",\"description\":\"\",\"name\":\"Power_factor\",\"typeSpec\":{\"type\":\"value\",\"max\":100,\"min\":0,\"scale\":2,\"step\":1,\"unit\":\"\"}},{\"abilityId\":111,\"accessMode\":\"ro\",\"code\":\"freq\",\"description\":\"\",\"name\":\"AC_Freq\",\"typeSpec\":{\"type\":\"value\",\"max\":10000,\"min\":0,\"scale\":2,\"step\":1,\"unit\":\"Hz\"}},{\"abilityId\":112,\"accessMode\":\"ro\",\"code\":\"voltage_a\",\"description\":\"\",\"name\":\"Voltage\",\"typeSpec\":{\"type\":\"value\",\"max\":28000,\"min\":0,\"scale\":1,\"step\":1,\"unit\":\"V\"}},{\"abilityId\":113,\"accessMode\":\"ro\",\"code\":\"current_a\",\"description\":\"\",\"name\":\"Current_a\",\"typeSpec\":{\"type\":\"value\",\"max\":1000000,\"min\":0,\"scale\":0,\"step\":1,\"unit\":\"mA\"}},{\"abilityId\":114,\"accessMode\":\"ro\",\"code\":\"current_b\",\"description\":\"\",\"name\":\"Current_b\",\"typeSpec\":{\"type\":\"value\",\"max\":1000000,\"min\":0,\"scale\":0,\"step\":1,\"unit\":\"mA\"}},{\"abilityId\":115,\"accessMode\":\"ro\",\"code\":\"total_power\",\"description\":\"\",\"name\":\" Total_Power\",\"typeSpec\":{\"type\":\"value\",\"max\":99999999,\"min\":-99999999,\"scale\":1,\"step\":1,\"unit\":\"W\"}},{\"abilityId\":116,\"accessMode\":\"rw\",\"code\":\"voltage_coef\",\"description\":\"\",\"name\":\"电压校准\",\"typeSpec\":{\"type\":\"value\",\"max\":1200,\"min\":800,\"scale\":3,\"step\":1,\"unit\":\"\"}},{\"abilityId\":117,\"accessMode\":\"rw\",\"code\":\"current_a_calibration\",\"description\":\"\",\"name\":\"current_a_calibration\",\"typeSpec\":{\"type\":\"value\",\"max\":1200,\"min\":800,\"scale\":3,\"step\":1,\"unit\":\"\"}},{\"abilityId\":118,\"accessMode\":\"rw\",\"code\":\"power_a_calibration\",\"description\":\"\",\"name\":\"power_a_calibration\",\"typeSpec\":{\"type\":\"value\",\"max\":1200,\"min\":800,\"scale\":3,\"step\":1,\"unit\":\"\"}},{\"abilityId\":119,\"accessMode\":\"rw\",\"code\":\"energy_a_calibration_fwd\",\"description\":\"\",\"name\":\"energy_a_calibration_fwd\",\"typeSpec\":{\"type\":\"value\",\"max\":1200,\"min\":800,\"scale\":3,\"step\":1,\"unit\":\"\"}},{\"abilityId\":120,\"accessMode\":\"wr\",\"code\":\"coef_a_reset\",\"description\":\"\",\"name\":\"coef_a_reset\",\"typeSpec\":{\"type\":\"bool\"}},{\"abilityId\":121,\"accessMode\":\"ro\",\"code\":\"power_factor_b\",\"description\":\"\",\"name\":\"Power_factor_b\",\"typeSpec\":{\"type\":\"value\",\"max\":100,\"min\":0,\"scale\":2,\"step\":1,\"unit\":\"\"}},{\"abilityId\":122,\"accessMode\":\"rw\",\"code\":\"freq_calibration\",\"description\":\"\",\"name\":\"频率校准\",\"typeSpec\":{\"type\":\"value\",\"max\":1200,\"min\":800,\"scale\":3,\"step\":1,\"unit\":\"\"}},{\"abilityId\":123,\"accessMode\":\"rw\",\"code\":\"current_b_calibration\",\"description\":\"\",\"name\":\"current_b_calibration\",\"typeSpec\":{\"type\":\"value\",\"max\":1200,\"min\":800,\"scale\":3,\"step\":1,\"unit\":\"\"}},{\"abilityId\":124,\"accessMode\":\"rw\",\"code\":\"power_b_calibration\",\"description\":\"\",\"name\":\"power_b_calibration\",\"typeSpec\":{\"type\":\"value\",\"max\":1200,\"min\":800,\"scale\":3,\"step\":1,\"unit\":\"\"}},{\"abilityId\":125,\"accessMode\":\"rw\",\"code\":\"energy_b_calibration_fwd\",\"description\":\"\",\"name\":\"energy_b_calibration_fwd\",\"typeSpec\":{\"type\":\"value\",\"max\":1200,\"min\":800,\"scale\":3,\"step\":1,\"unit\":\"\"}},{\"abilityId\":126,\"accessMode\":\"wr\",\"code\":\"coef_b_reset\",\"description\":\"\",\"name\":\"coef_b_reset\",\"typeSpec\":{\"type\":\"bool\"}},{\"abilityId\":127,\"accessMode\":\"rw\",\"code\":\"energy_a_calibration_rev\",\"description\":\"\",\"name\":\"energy_a_calibration_rev\",\"typeSpec\":{\"type\":\"value\",\"max\":1200,\"min\":800,\"scale\":3,\"step\":1,\"unit\":\"\"}},{\"abilityId\":128,\"accessMode\":\"rw\",\"code\":\"energy_b_calibration_rev\",\"description\":\"\",\"name\":\"energy_b_calibration_rev\",\"typeSpec\":{\"type\":\"value\",\"max\":1200,\"min\":800,\"scale\":3,\"step\":1,\"unit\":\"\"}},{\"abilityId\":129,\"accessMode\":\"rw\",\"code\":\"report_rate_control\",\"description\":\"\",\"name\":\"上报频率\",\"typeSpec\":{\"type\":\"value\",\"max\":60,\"min\":3,\"scale\":0,\"step\":1,\"unit\":\"s\"}},{\"abilityId\":130,\"accessMode\":\"ro\",\"code\":\"forward_energy_total\",\"description\":\"\",\"name\":\"forward_energy_total\",\"typeSpec\":{\"type\":\"value\",\"max\":99999999,\"min\":0,\"scale\":2,\"step\":1,\"unit\":\"KWH\"}},{\"abilityId\":131,\"accessMode\":\"ro\",\"code\":\"reverse_energy_total\",\"description\":\"\",\"name\":\"reverse_energy_total\",\"typeSpec\":{\"type\":\"value\",\"max\":99999999,\"min\":0,\"scale\":2,\"step\":1,\"unit\":\"KWH\"}}]}]}",
+  "features": [],
+  "params": [
+    {
+      "name": "DEVICE_ID",
+      "value": "bf8a5bf8acc4540a41rere"
+    },
+    {
+      "name": "LOCAL_KEY",
+      "value": "***"
+    },
+    {
+      "name": "CLOUD_IP",
+      "value": "62.x.x.x"
+    },
+    {
+      "name": "LOCAL_OVERRIDE",
+      "value": true
+    },
+    {
+      "name": "PRODUCT_ID",
+      "value": "bbcg1hrkrj5rifsd"
+    }
+  ],
+  "local_poll": {
+    "status": null,
+    "error": null,
+    "protocol": null,
+    "dps": null
   }
 }
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/local-dps.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/local-dps.json
index 9d65a13b98..ab75f109b5 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/local-dps.json
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/local-dps.json
@@ -1,8 +1,33 @@
 {
+  "101": 706,
+  "102": "FORWARD",
+  "103": false,
+  "104": "REVERSE",
+  "105": 0,
+  "106": 149241,
+  "107": 43222,
+  "108": 0,
+  "109": 0,
+  "110": 73,
+  "111": 4927,
+  "112": 2352,
+  "113": 410,
+  "114": 0,
   "115": 706,
+  "116": 1000,
+  "117": 1000,
+  "118": 1000,
+  "119": 1000,
+  "120": false,
+  "121": 100,
+  "122": 1000,
+  "123": 1000,
+  "124": 1000,
+  "125": 1000,
+  "126": false,
+  "127": 1000,
+  "128": 1000,
+  "129": 10,
   "130": 149241,
-  "112": 2301,
-  "113": 123,
-  "114": 456,
   "131": 43222
 }
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/manifest.js b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/manifest.js
index 6d8d8d5f65..db72b419b6 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/manifest.js
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/manifest.js
@@ -1,5 +1,5 @@
 module.exports = {
-  name: 'smart meter bbcg1hrkrj5rifsd',
+  name: 'Production solaire',
   convertDevice: {
     input: './input-device.json',
     expected: './expected-device.json',
@@ -7,12 +7,12 @@ module.exports = {
   pollCloud: {
     device: './poll-device.json',
     response: './cloud-status.json',
-    expectedEvents: './expected-cloud-events.json',
+    expectedEvents: './expected-events.json',
   },
   pollLocal: {
     device: './poll-device.json',
     dps: './local-dps.json',
-    expectedEvents: './expected-local-events.json',
+    expectedEvents: './expected-events.json',
     expectedCloudRequests: 0,
   },
   localMapping: {
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json
index 546a7f9472..ec751e3628 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json
@@ -2,50 +2,101 @@
   "external_id": "tuya:smart-meter-device-id",
   "device_type": "smart-meter",
   "params": [
-    { "name": "IP_ADDRESS", "value": "10.0.0.20" },
+    { "name": "DEVICE_ID", "value": "smart-meter-device-id" },
     { "name": "LOCAL_KEY", "value": "local-key" },
+    { "name": "IP_ADDRESS", "value": "10.0.0.20" },
+    { "name": "CLOUD_IP", "value": "82.0.0.10" },
+    { "name": "LOCAL_OVERRIDE", "value": true },
     { "name": "PROTOCOL_VERSION", "value": "3.3" },
-    { "name": "LOCAL_OVERRIDE", "value": true }
+    { "name": "PRODUCT_ID", "value": "bbcg1hrkrj5rifsd" }
   ],
   "features": [
     {
-      "external_id": "tuya:smart-meter-device-id:total_power",
-      "selector": "tuya:smart-meter-device-id:total_power",
+      "external_id": "tuya:smart-meter-device-id:power_a",
+      "selector": "tuya:smart-meter-device-id:power_a",
       "category": "energy-sensor",
       "type": "power",
-      "scale": 1,
-      "last_value": 0
+      "last_value": 0,
+      "scale": 1
     },
     {
-      "external_id": "tuya:smart-meter-device-id:forward_energy_total",
-      "selector": "tuya:smart-meter-device-id:forward_energy_total",
+      "external_id": "tuya:smart-meter-device-id:power_b",
+      "selector": "tuya:smart-meter-device-id:power_b",
+      "category": "energy-sensor",
+      "type": "power",
+      "last_value": 0,
+      "scale": 1
+    },
+    {
+      "external_id": "tuya:smart-meter-device-id:energy_forword_a",
+      "selector": "tuya:smart-meter-device-id:energy_forword_a",
       "category": "energy-sensor",
       "type": "energy",
-      "scale": 2,
-      "last_value": 0
+      "last_value": 0,
+      "scale": 2
+    },
+    {
+      "external_id": "tuya:smart-meter-device-id:energy_reverse_a",
+      "selector": "tuya:smart-meter-device-id:energy_reverse_a",
+      "category": "energy-production-sensor",
+      "type": "index",
+      "last_value": 0,
+      "scale": 2
+    },
+    {
+      "external_id": "tuya:smart-meter-device-id:energy_forword_b",
+      "selector": "tuya:smart-meter-device-id:energy_forword_b",
+      "category": "energy-sensor",
+      "type": "energy",
+      "last_value": 0,
+      "scale": 2
+    },
+    {
+      "external_id": "tuya:smart-meter-device-id:energy_reserse_b",
+      "selector": "tuya:smart-meter-device-id:energy_reserse_b",
+      "category": "energy-production-sensor",
+      "type": "index",
+      "last_value": 0,
+      "scale": 2
     },
     {
       "external_id": "tuya:smart-meter-device-id:voltage_a",
       "selector": "tuya:smart-meter-device-id:voltage_a",
       "category": "energy-sensor",
       "type": "voltage",
-      "scale": 1,
-      "last_value": 0
+      "last_value": 0,
+      "scale": 1
     },
     {
       "external_id": "tuya:smart-meter-device-id:current_a",
       "selector": "tuya:smart-meter-device-id:current_a",
       "category": "energy-sensor",
       "type": "current",
-      "scale": 0,
-      "last_value": 0
+      "last_value": 0,
+      "scale": 0
     },
     {
       "external_id": "tuya:smart-meter-device-id:current_b",
       "selector": "tuya:smart-meter-device-id:current_b",
       "category": "energy-sensor",
       "type": "current",
-      "scale": 0,
+      "last_value": 0,
+      "scale": 0
+    },
+    {
+      "external_id": "tuya:smart-meter-device-id:total_power",
+      "selector": "tuya:smart-meter-device-id:total_power",
+      "category": "energy-sensor",
+      "type": "power",
+      "scale": 1,
+      "last_value": 0
+    },
+    {
+      "external_id": "tuya:smart-meter-device-id:forward_energy_total",
+      "selector": "tuya:smart-meter-device-id:forward_energy_total",
+      "category": "energy-sensor",
+      "type": "energy",
+      "scale": 2,
       "last_value": 0
     },
     {
@@ -56,5 +107,48 @@
       "scale": 2,
       "last_value": 0
     }
-  ]
+  ],
+  "tuya_mapping": {
+    "ignored_local_dps": [
+      "102",
+      "103",
+      "104",
+      "110",
+      "116",
+      "117",
+      "118",
+      "119",
+      "120",
+      "121",
+      "122",
+      "123",
+      "124",
+      "125",
+      "126",
+      "127",
+      "128",
+      "129"
+    ],
+    "ignored_cloud_codes": [
+      "coef_a_reset",
+      "coef_b_reset",
+      "current_a_calibration",
+      "current_b_calibration",
+      "direction_a",
+      "direction_b",
+      "energy_a_calibration_fwd",
+      "energy_a_calibration_rev",
+      "energy_b_calibration_fwd",
+      "energy_b_calibration_rev",
+      "freq",
+      "freq_calibration",
+      "power_a_calibration",
+      "power_b_calibration",
+      "power_factor",
+      "power_factor_b",
+      "report_rate_control",
+      "tbd",
+      "voltage_coef"
+    ]
+  }
 }
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js
index b8e55e5829..1d3814ed60 100644
--- a/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.fixtures.test.js
@@ -3,6 +3,54 @@ const { expect } = require('chai');
 const { convertDevice } = require('../../../../../services/tuya/lib/device/tuya.convertDevice');
 const { loadFixtureCases, normalizeConvertedDevice, sortByKey } = require('../../fixtures/fixtureHelper');
 
+const cloneDeep = (value) => JSON.parse(JSON.stringify(value));
+
+const getFeatureCode = (feature) => {
+  if (!feature || !feature.external_id) {
+    return null;
+  }
+  return String(feature.external_id)
+    .split(':')
+    .pop();
+};
+
+const removeCodeFromInput = (input, code) => {
+  if (!input || !code) {
+    return 0;
+  }
+
+  let removed = 0;
+  const filterEntries = (entries) =>
+    (Array.isArray(entries) ? entries : []).filter((entry) => {
+      const keep = entry && entry.code !== code;
+      if (!keep) {
+        removed += 1;
+      }
+      return keep;
+    });
+
+  if (input.specifications && typeof input.specifications === 'object') {
+    ['functions', 'status', 'properties'].forEach((key) => {
+      if (Array.isArray(input.specifications[key])) {
+        input.specifications[key] = filterEntries(input.specifications[key]);
+      }
+    });
+  }
+
+  if (input.properties && Array.isArray(input.properties.properties)) {
+    input.properties.properties = filterEntries(input.properties.properties);
+  }
+
+  if (input.thing_model && Array.isArray(input.thing_model.services)) {
+    input.thing_model.services = input.thing_model.services.map((service) => ({
+      ...service,
+      properties: filterEntries(service && service.properties),
+    }));
+  }
+
+  return removed;
+};
+
 describe('tuya.convertDevice fixtures', () => {
   const fixtureCases = loadFixtureCases('convertDevice');
 
@@ -17,5 +65,35 @@ describe('tuya.convertDevice fixtures', () => {
 
       expect(normalizeConvertedDevice(device)).to.deep.equal(sortByKey(fixtureCase.load(expected)));
     });
+
+    it(`should drop a supported feature when its source code is removed for ${fixtureCase.manifest.name}`, () => {
+      const { input } = fixtureCase.manifest.convertDevice;
+      const sourceInput = fixtureCase.load(input);
+      const converted = convertDevice.call({ serviceId: 'service-id' }, sourceInput);
+      const removableFeature = (Array.isArray(converted.features) ? converted.features : [])
+        .map((feature) => ({
+          feature,
+          code: getFeatureCode(feature),
+        }))
+        .find(({ code }) => {
+          const degradedInput = cloneDeep(sourceInput);
+          return removeCodeFromInput(degradedInput, code) > 0;
+        });
+
+      expect(removableFeature, 'fixture should expose at least one removable supported feature').to.not.equal(
+        undefined,
+      );
+
+      const degradedInput = cloneDeep(sourceInput);
+      const removedCount = removeCodeFromInput(degradedInput, removableFeature.code);
+      expect(removedCount).to.be.greaterThan(0);
+
+      const degradedDevice = convertDevice.call({ serviceId: 'service-id' }, degradedInput);
+      const degradedCodes = new Set(
+        (Array.isArray(degradedDevice.features) ? degradedDevice.features : []).map(getFeatureCode),
+      );
+
+      expect(degradedCodes.has(removableFeature.code)).to.equal(false);
+    });
   });
 });
diff --git a/server/test/services/tuya/lib/tuya.poll.fixtures.test.js b/server/test/services/tuya/lib/tuya.poll.fixtures.test.js
index c10b76b6ae..1af4d7df86 100644
--- a/server/test/services/tuya/lib/tuya.poll.fixtures.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.fixtures.test.js
@@ -5,6 +5,7 @@ const proxyquire = require('proxyquire').noCallThru();
 const { EVENTS } = require('../../../../utils/constants');
 const { loadFixtureCases, normalizeEvents, sortByKey } = require('../fixtures/fixtureHelper');
 const { poll: pollCloud } = require('../../../../services/tuya/lib/tuya.poll');
+const { getLocalDpsFromCode } = require('../../../../services/tuya/lib/device/tuya.localMapping');
 
 const createGladysContext = () => ({
   event: {
@@ -12,6 +13,17 @@ const createGladysContext = () => ({
   },
 });
 
+const cloneDeep = (value) => JSON.parse(JSON.stringify(value));
+
+const getFeatureCode = (feature) => {
+  if (!feature || !feature.external_id) {
+    return null;
+  }
+  return String(feature.external_id)
+    .split(':')
+    .pop();
+};
+
 const forceCloudMode = (device) => ({
   ...device,
   params: (Array.isArray(device.params) ? device.params : []).map((param) =>
@@ -67,5 +79,49 @@ describe('TuyaHandler.poll fixtures', () => {
       expect(normalizeEvents(emittedEvents)).to.deep.equal(sortByKey(fixtureCase.load(expectedEvents)));
       expect(connector.request.callCount).to.equal(expectedCloudRequests);
     });
+
+    it(`should not emit a feature state when its local dps is missing for ${fixtureCase.manifest.name}`, async () => {
+      const { device, dps } = fixtureCase.manifest.pollLocal;
+      const currentDevice = fixtureCase.load(device);
+      const currentDps = fixtureCase.load(dps);
+      const removableFeature = (Array.isArray(currentDevice.features) ? currentDevice.features : [])
+        .map((feature) => {
+          const code = getFeatureCode(feature);
+          const dpsKey = getLocalDpsFromCode(code, currentDevice);
+          return {
+            feature,
+            code,
+            dpsKey,
+          };
+        })
+        .find(({ dpsKey }) => dpsKey !== null && Object.prototype.hasOwnProperty.call(currentDps, String(dpsKey)));
+
+      expect(removableFeature, 'fixture should expose at least one locally mapped dps').to.not.equal(undefined);
+
+      const degradedDps = cloneDeep(currentDps);
+      delete degradedDps[String(removableFeature.dpsKey)];
+
+      const localPoll = sinon.stub().resolves({ dps: degradedDps });
+      const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+        './tuya.localPoll': { localPoll },
+      });
+      const connector = {
+        request: sinon.stub().resolves({ result: [] }),
+      };
+      const gladys = createGladysContext();
+
+      await poll.call(
+        {
+          connector,
+          gladys,
+        },
+        currentDevice,
+      );
+
+      const emittedEvents = gladys.event.emit.getCalls().filter((call) => call.args[0] === EVENTS.DEVICE.NEW_STATE);
+      const emittedFeatureIds = emittedEvents.map((call) => call.args[1].device_feature_external_id);
+
+      expect(emittedFeatureIds).to.not.include(removableFeature.feature.external_id);
+    });
   });
 });

From 359fdd784c882f7784c4412c44f5304dd25398ab Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Mon, 2 Mar 2026 00:44:29 +0100
Subject: [PATCH 78/90] docs(tuya): improve unsupported device guidance

---
 front/src/config/i18n/de.json                 |  1 +
 front/src/config/i18n/en.json                 |  1 +
 front/src/config/i18n/fr.json                 |  1 +
 .../integration/all/tuya/TuyaDeviceBox.jsx    | 21 +++++----
 .../all/tuya/commons/githubIssue.js           | 47 ++++++++++++++-----
 5 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 7b43f9b6c6..7555b3ec93 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -1231,6 +1231,7 @@
         "productKeyLabel": "Produktschlüssel",
         "createGithubIssue": "Dieses Gerät vorschlagen",
         "createGithubIssuePartial": "Neue Funktionen vorschlagen",
+        "githubIssueLocalPrepInfo": "Um alle lokalen Informationen im Issue zu erfassen, kannst du zuerst auf der Erkennungsseite einen <strong>Lokalen Auto-Scan</strong> starten, damit alle Geräte mit ihren lokalen Daten angereichert werden.<br />Wechsle danach das Gerät bei Bedarf in den lokalen Modus, trage IP und Protokoll ein und führe anschließend <strong>Lokales DPS abfragen</strong> erfolgreich aus, bevor du auf die Vorschlags-Schaltfläche klickst.",
         "githubIssueInfo": "Ein Bericht wird mit den Gerätedetails gesendet. Sensible Daten (Lokaler Schlüssel und IP-Adresse) werden maskiert.",
         "githubIssuePayloadCopied": "Issue-Details wurden in die Zwischenablage kopiert. Bitte in den GitHub-Issue-Text einfügen.",
         "githubIssuePayloadInfo": "Die Issue-Details sind zu lang für die URL. Bitte den Inhalt unten kopieren und in den GitHub-Issue-Text einfügen.",
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index efdd171f24..1d92b80a45 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -1126,6 +1126,7 @@
         "productKeyLabel": "Product Key",
         "createGithubIssue": "Suggest this device",
         "createGithubIssuePartial": "Suggest new functions",
+        "githubIssueLocalPrepInfo": "To include all local information in the issue, you can first run <strong>Local auto scan</strong> from the discovery page to enrich all devices with their local data.<br />Then switch the device to local mode if needed, fill in the IP and protocol, and run a successful <strong>Poll local DPS</strong> before clicking the suggestion button.",
         "githubIssueInfo": "A report will be sent with the device details. Sensitive data (local key and IP) is masked.",
         "githubIssuePayloadCopied": "Issue details copied to clipboard. Paste them into the GitHub issue body.",
         "githubIssuePayloadInfo": "The issue details are too long for the URL. Copy the content below and paste it into the GitHub issue body.",
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index f586be943f..c86ed92caf 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -1361,6 +1361,7 @@
         "productKeyLabel": "Clé produit",
         "createGithubIssue": "Proposer ce périphérique",
         "createGithubIssuePartial": "Proposer nouvelles fonctions",
+        "githubIssueLocalPrepInfo": "Pour inclure toutes les informations locales dans l'issue, vous pouvez d'abord lancer un <strong>Scan local auto</strong> depuis la page de découverte pour enrichir tous les appareils avec leurs données locales.<br />Ensuite, passez en mode local sur l'appareil si nécessaire, renseignez l'IP et le protocole, puis lancez une <strong>Lecture locale des DP</strong> avec succès avant de cliquer sur le bouton de proposition.",
         "githubIssueInfo": "Un rapport sera envoyé avec les informations du périphérique. Les données sensibles (clé locale et IP) sont masquées.",
         "githubIssuePayloadCopied": "Les détails ont été copiés dans le presse-papiers. Collez-les dans le corps de l'issue GitHub.",
         "githubIssuePayloadInfo": "Les détails sont trop longs pour l'URL. Copiez le contenu ci-dessous et collez-le dans le corps de l'issue GitHub.",
diff --git a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
index a9711711f1..385d4c30fb 100644
--- a/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
+++ b/front/src/routes/integration/all/tuya/TuyaDeviceBox.jsx
@@ -747,6 +747,17 @@ class TuyaDeviceBox extends Component {
       </div>
     );
 
+    const renderGithubIssuePrepAlert = titleId => (
+      <div class="alert alert-warning mt-3 mb-3">
+        <div class="font-weight-bold h5 mb-2">
+          <Text id={titleId} />
+        </div>
+        <div>
+          <MarkupText id="integration.tuya.device.githubIssueLocalPrepInfo" />
+        </div>
+      </div>
+    );
+
     const renderGithubIssuePayloadInfo = () => {
       if (!githubIssuePayload && !githubIssuePayloadCopied) {
         return null;
@@ -1013,11 +1024,7 @@ class TuyaDeviceBox extends Component {
                   </div>
                 )}
 
-                {hasPartialSupport && (
-                  <div class="alert alert-warning mt-3 mb-3">
-                    <Text id="integration.tuya.partiallyManagedModelButton" />
-                  </div>
-                )}
+                {hasPartialSupport && renderGithubIssuePrepAlert('integration.tuya.partiallyManagedModelButton')}
 
                 <div class="form-group">
                   {requiresLocalPollValidation && !localPollValidated && (
@@ -1059,9 +1066,7 @@ class TuyaDeviceBox extends Component {
 
                   {!validModel && (
                     <div>
-                      <div class="alert alert-warning">
-                        <Text id="integration.tuya.unmanagedModelButton" />
-                      </div>
+                      {renderGithubIssuePrepAlert('integration.tuya.unmanagedModelButton')}
                       {isDiscoverPage && renderGithubIssueAction()}
                     </div>
                   )}
diff --git a/front/src/routes/integration/all/tuya/commons/githubIssue.js b/front/src/routes/integration/all/tuya/commons/githubIssue.js
index f6e4e7ba12..9fb04ff0f6 100644
--- a/front/src/routes/integration/all/tuya/commons/githubIssue.js
+++ b/front/src/routes/integration/all/tuya/commons/githubIssue.js
@@ -382,18 +382,28 @@ const buildIssueBody = (device, localPollStatus, localPollError, localPollValida
     `- Local poll status: \`${get(issuePayload, 'local.poll.status') || 'not-run'}\``,
     `- Local poll protocol: \`${get(issuePayload, 'local.poll.protocol') || 'unknown'}\``,
     '',
+    '## Implementation Guide',
+    '',
+    'Implement the Tuya support first, then finalize the tests:',
+    '',
+    '1. Add or update the Tuya cloud mapping in `server/services/tuya/lib/mappings/cloud/`.',
+    '2. Add or update the Tuya local mapping in `server/services/tuya/lib/mappings/local/`.',
+    '3. Register or update the device definition in `server/services/tuya/lib/mappings/index.js`.',
+    '4. If the new feature needs a new Gladys `category/type`, add it in `server/utils/constants.js`.',
+    '5. If the new feature uses a new `category/type` not yet handled by Tuya reading, update `readValues` in `server/services/tuya/lib/device/tuya.deviceMapping.js`.',
+    '6. If the feature should be writable from Gladys, also update `writeValues` in `server/services/tuya/lib/device/tuya.deviceMapping.js`.',
+    '',
     '## Maintainer Notes',
     '',
     'This issue contains:',
     '- the complete structured Tuya report',
-    '- suggested fixture input files for PR5-style onboarding tests',
+    '- suggested fixture input files for onboarding tests',
     '- raw cloud responses',
     '- local poll DPS when available',
     '',
     'This issue does not contain:',
     '- `expected-device.json`',
-    '- `expected-cloud-events.json`',
-    '- `expected-local-events.json`',
+    '- `expected-events.json` or `expected-cloud-events.json` / `expected-local-events.json`',
     '- `expected-local-mapping.json`',
     '',
     'These expected files should still be reviewed and created manually.',
@@ -471,6 +481,20 @@ const buildIssueBody = (device, localPollStatus, localPollError, localPollValida
     );
   }
 
+  sections.push(
+    '## Manual Files Guide',
+    '',
+    'Build the remaining files manually after the Tuya mappings are in place:',
+    '',
+    '1. Paste `input-device.json` from this issue, then add or update the Tuya mappings in `server/services/tuya/lib/mappings/cloud/`, `server/services/tuya/lib/mappings/local/`, and `server/services/tuya/lib/mappings/index.js`.',
+    '2. Create `expected-device.json` from the final Gladys device returned by `convertDevice`. This corresponds to the Tuya device as it should appear in the Discover page once support is implemented.',
+    '3. Build or complete `poll-device.json` from the final supported Gladys features. It should contain the final `device_type`, `features`, params, and `tuya_mapping` metadata.',
+    '4. Copy `cloud-status.json` from the cloud property values and `local-dps.json` from the local poll DPS payload when available.',
+    '5. Create `expected-events.json` if cloud and local polling should emit the same states. If they differ, keep separate `expected-cloud-events.json` and `expected-local-events.json` files instead.',
+    '6. Create `expected-local-mapping.json` from the final supported features present in `poll-device.json`, using the resolved DPS returned by the local mapping.',
+    ''
+  );
+
   sections.push(
     '## Device List Entry',
     '',
@@ -484,14 +508,6 @@ const buildIssueBody = (device, localPollStatus, localPollError, localPollValida
     '',
     toCodeBlock('json', supplementalDiagnostics),
     '',
-    '## Mapping Work Required',
-    '',
-    'If this device needs new support in Gladys, the maintainer will usually need to:',
-    '- create or update a cloud mapping file in `server/services/tuya/lib/mappings/cloud/`',
-    '- create or update a local mapping file in `server/services/tuya/lib/mappings/local/`',
-    '- register the mapping in `server/services/tuya/lib/mappings/index.js`',
-    '- re-run conversion and polling expectations after the mapping changes',
-    '',
     'Note:',
     '',
     '- The raw `thing_model.response.result.model` string is intentionally omitted here because it is already represented in a readable object form in `input-device.json > thing_model`.',
@@ -503,10 +519,11 @@ const buildIssueBody = (device, localPollStatus, localPollError, localPollValida
       [
         'mapping file(s) in `server/services/tuya/lib/mappings/cloud/` and/or `server/services/tuya/lib/mappings/local/`',
         '`server/services/tuya/lib/mappings/index.js`',
+        '`server/utils/constants.js` when a new Gladys category/type is required',
+        '`server/services/tuya/lib/device/tuya.deviceMapping.js` when new read/write handlers are required',
         'poll-device.json (completed with final supported features)',
         'expected-device.json',
-        'expected-cloud-events.json',
-        'expected-local-events.json',
+        'expected-events.json or expected-cloud-events.json / expected-local-events.json',
         'expected-local-mapping.json'
       ].join('\n')
     ),
@@ -516,8 +533,12 @@ const buildIssueBody = (device, localPollStatus, localPollError, localPollValida
     '- Confirm the inferred `device_type`',
     '- Create or update the mapping files in `server/services/tuya/lib/mappings/cloud/` and/or `server/services/tuya/lib/mappings/local/`',
     '- Register the mapping in `server/services/tuya/lib/mappings/index.js`',
+    '- Update `server/utils/constants.js` if the feature introduces a new Gladys `category/type`',
+    '- Update `server/services/tuya/lib/device/tuya.deviceMapping.js` if new `readValues` or `writeValues` handlers are needed',
     '- Rebuild `poll-device.json` so it matches the final supported Gladys features',
+    '- Build `expected-device.json` from the final converted Gladys device shown in Discover',
     '- Confirm the expected Gladys features',
+    '- Use a shared `expected-events.json` only when cloud and local polling should emit the same states',
     '- Confirm cloud polling behavior',
     '- Confirm local polling behavior',
     '- Confirm local mapping',

From 124b341e04027765b112d723d04c209fb85f791f Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Mon, 2 Mar 2026 09:56:23 +0100
Subject: [PATCH 79/90] Add support for LSC Power Plug FR smart socket

---
 .../tuya/lib/device/tuya.deviceMapping.js     |  11 ++
 .../tuya/lib/mappings/cloud/smart-socket.js   |   4 +
 .../tuya/lib/mappings/local/smart-socket.js   |   6 +
 .../cloud-status.json                         |  10 ++
 .../expected-cloud-events.json                |  26 +++++
 .../expected-device.json                      | 100 +++++++++++++++++
 .../expected-local-events.json                |  22 ++++
 .../expected-local-mapping.json               |   8 ++
 .../input-device.json                         | 104 ++++++++++++++++++
 .../local-dps.json                            |  18 +++
 .../smart-socket-b61eihfqeaexn54g/manifest.js |  32 ++++++
 .../poll-device.json                          |  92 ++++++++++++++++
 .../expected-local-mapping.json               |   2 +-
 .../device/feature/tuya.deviceMapping.test.js |   8 ++
 .../tuya/lib/device/tuya.localMapping.test.js |  10 ++
 .../tuya/lib/tuya.setValue.fixtures.test.js   |   2 +-
 16 files changed, 453 insertions(+), 2 deletions(-)
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/cloud-status.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-cloud-events.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-local-events.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-local-mapping.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/input-device.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/local-dps.json
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/manifest.js
 create mode 100644 server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/poll-device.json

diff --git a/server/services/tuya/lib/device/tuya.deviceMapping.js b/server/services/tuya/lib/device/tuya.deviceMapping.js
index 7f9bade2ed..535dd7be07 100644
--- a/server/services/tuya/lib/device/tuya.deviceMapping.js
+++ b/server/services/tuya/lib/device/tuya.deviceMapping.js
@@ -53,6 +53,12 @@ const writeValues = {
     },
   },
 
+  [DEVICE_FEATURE_CATEGORIES.CHILD_LOCK]: {
+    [DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY]: (valueFromGladys) => {
+      return valueFromGladys === 1;
+    },
+  },
+
   [DEVICE_FEATURE_CATEGORIES.CURTAIN]: {
     [DEVICE_FEATURE_TYPES.CURTAIN.STATE]: (valueFromGladys) => {
       if (valueFromGladys === COVER_STATE.OPEN) {
@@ -105,6 +111,11 @@ const readValues = {
       return scaleValue(valueFromDevice, deviceFeature, 1);
     },
   },
+  [DEVICE_FEATURE_CATEGORIES.CHILD_LOCK]: {
+    [DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY]: (valueFromDevice) => {
+      return normalizeBoolean(valueFromDevice) ? 1 : 0;
+    },
+  },
   [DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR]: {
     [DEVICE_FEATURE_TYPES.ENERGY_SENSOR.POWER]: (valueFromDevice, deviceFeature) => {
       return scaleValue(valueFromDevice, deviceFeature, 0);
diff --git a/server/services/tuya/lib/mappings/cloud/smart-socket.js b/server/services/tuya/lib/mappings/cloud/smart-socket.js
index 71c6e4f2de..c42d502fdd 100644
--- a/server/services/tuya/lib/mappings/cloud/smart-socket.js
+++ b/server/services/tuya/lib/mappings/cloud/smart-socket.js
@@ -30,6 +30,10 @@ module.exports = {
     category: DEVICE_FEATURE_CATEGORIES.SWITCH,
     type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
   },
+  child_lock: {
+    category: DEVICE_FEATURE_CATEGORIES.CHILD_LOCK,
+    type: DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY,
+  },
   add_ele: {
     category: DEVICE_FEATURE_CATEGORIES.SWITCH,
     type: DEVICE_FEATURE_TYPES.SWITCH.ENERGY,
diff --git a/server/services/tuya/lib/mappings/local/smart-socket.js b/server/services/tuya/lib/mappings/local/smart-socket.js
index 641976b01a..f4d7e1ef79 100644
--- a/server/services/tuya/lib/mappings/local/smart-socket.js
+++ b/server/services/tuya/lib/mappings/local/smart-socket.js
@@ -2,6 +2,7 @@ module.exports = {
   strict: true,
   ignoredDps: ['11'],
   codeAliases: {
+    child_lock: [],
     switch: ['power'],
     power: ['switch'],
     switch_1: ['switch', 'power'],
@@ -10,6 +11,11 @@ module.exports = {
     switch_4: ['switch'],
   },
   dps: {
+    add_ele: 17,
+    cur_current: 18,
+    cur_power: 19,
+    cur_voltage: 20,
+    child_lock: 41,
     switch: 1,
     power: 1,
     switch_1: 1,
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/cloud-status.json b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/cloud-status.json
new file mode 100644
index 0000000000..1f9feef8f0
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/cloud-status.json
@@ -0,0 +1,10 @@
+{
+  "result": [
+    { "code": "switch_1", "value": false },
+    { "code": "child_lock", "value": false },
+    { "code": "add_ele", "value": 1 },
+    { "code": "cur_current", "value": 0 },
+    { "code": "cur_power", "value": 0 },
+    { "code": "cur_voltage", "value": 2340 }
+  ]
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-cloud-events.json b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-cloud-events.json
new file mode 100644
index 0000000000..3c08aa8166
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-cloud-events.json
@@ -0,0 +1,26 @@
+[
+  {
+    "device_feature_external_id": "tuya:bf2be3c32ea4d8f561ujmu:add_ele",
+    "state": 0.001
+  },
+  {
+    "device_feature_external_id": "tuya:bf2be3c32ea4d8f561ujmu:child_lock",
+    "state": 0
+  },
+  {
+    "device_feature_external_id": "tuya:bf2be3c32ea4d8f561ujmu:cur_current",
+    "state": 0
+  },
+  {
+    "device_feature_external_id": "tuya:bf2be3c32ea4d8f561ujmu:cur_power",
+    "state": 0
+  },
+  {
+    "device_feature_external_id": "tuya:bf2be3c32ea4d8f561ujmu:cur_voltage",
+    "state": 234
+  },
+  {
+    "device_feature_external_id": "tuya:bf2be3c32ea4d8f561ujmu:switch_1",
+    "state": 0
+  }
+]
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
new file mode 100644
index 0000000000..d81a99ce7a
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
@@ -0,0 +1,100 @@
+{
+  "name": "Chauffage cabinet",
+  "external_id": "tuya:bf2be3c32ea4d8f561ujmu",
+  "selector": "tuya:bf2be3c32ea4d8f561ujmu",
+  "device_type": "smart-socket",
+  "model": "LSC Power Plug FR incl. Power meter",
+  "product_id": "b61eihfqeaexn54g",
+  "online": true,
+  "poll_frequency": 10000,
+  "should_poll": true,
+  "params": {
+    "DEVICE_ID": "bf2be3c32ea4d8f561ujmu",
+    "LOCAL_KEY": "local-key",
+    "IP_ADDRESS": "192.168.1.50",
+    "CLOUD_IP": "91.0.0.1",
+    "LOCAL_OVERRIDE": true,
+    "PROTOCOL_VERSION": "3.5",
+    "PRODUCT_ID": "b61eihfqeaexn54g"
+  },
+  "tuya_mapping": {
+    "ignored_local_dps": ["11"],
+    "ignored_cloud_codes": ["countdown", "countdown_1"]
+  },
+  "features": [
+    {
+      "name": "switch_1",
+      "external_id": "tuya:bf2be3c32ea4d8f561ujmu:switch_1",
+      "selector": "tuya:bf2be3c32ea4d8f561ujmu:switch_1",
+      "category": "switch",
+      "type": "binary",
+      "read_only": false,
+      "has_feedback": false,
+      "min": 0,
+      "max": 1
+    },
+    {
+      "name": "child_lock",
+      "external_id": "tuya:bf2be3c32ea4d8f561ujmu:child_lock",
+      "selector": "tuya:bf2be3c32ea4d8f561ujmu:child_lock",
+      "category": "child-lock",
+      "type": "binary",
+      "read_only": false,
+      "has_feedback": false,
+      "min": 0,
+      "max": 1
+    },
+    {
+      "name": "add_ele",
+      "external_id": "tuya:bf2be3c32ea4d8f561ujmu:add_ele",
+      "selector": "tuya:bf2be3c32ea4d8f561ujmu:add_ele",
+      "category": "switch",
+      "type": "energy",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 50000,
+      "unit": "kilowatt-hour",
+      "scale": 3
+    },
+    {
+      "name": "cur_current",
+      "external_id": "tuya:bf2be3c32ea4d8f561ujmu:cur_current",
+      "selector": "tuya:bf2be3c32ea4d8f561ujmu:cur_current",
+      "category": "switch",
+      "type": "current",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 30000,
+      "unit": "milliampere",
+      "scale": 0
+    },
+    {
+      "name": "cur_power",
+      "external_id": "tuya:bf2be3c32ea4d8f561ujmu:cur_power",
+      "selector": "tuya:bf2be3c32ea4d8f561ujmu:cur_power",
+      "category": "switch",
+      "type": "power",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 80000,
+      "unit": "watt",
+      "scale": 1
+    },
+    {
+      "name": "cur_voltage",
+      "external_id": "tuya:bf2be3c32ea4d8f561ujmu:cur_voltage",
+      "selector": "tuya:bf2be3c32ea4d8f561ujmu:cur_voltage",
+      "category": "switch",
+      "type": "voltage",
+      "read_only": true,
+      "has_feedback": false,
+      "min": 0,
+      "max": 5000,
+      "unit": "volt",
+      "scale": 1
+    }
+  ]
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-local-events.json b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-local-events.json
new file mode 100644
index 0000000000..0b2a6f9912
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-local-events.json
@@ -0,0 +1,22 @@
+[
+  {
+    "device_feature_external_id": "tuya:bf2be3c32ea4d8f561ujmu:child_lock",
+    "state": 0
+  },
+  {
+    "device_feature_external_id": "tuya:bf2be3c32ea4d8f561ujmu:cur_current",
+    "state": 0
+  },
+  {
+    "device_feature_external_id": "tuya:bf2be3c32ea4d8f561ujmu:cur_power",
+    "state": 0
+  },
+  {
+    "device_feature_external_id": "tuya:bf2be3c32ea4d8f561ujmu:cur_voltage",
+    "state": 226.8
+  },
+  {
+    "device_feature_external_id": "tuya:bf2be3c32ea4d8f561ujmu:switch_1",
+    "state": 0
+  }
+]
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-local-mapping.json b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-local-mapping.json
new file mode 100644
index 0000000000..3def215fa2
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-local-mapping.json
@@ -0,0 +1,8 @@
+{
+  "switch_1": 1,
+  "child_lock": 41,
+  "add_ele": 17,
+  "cur_current": 18,
+  "cur_power": 19,
+  "cur_voltage": 20
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/input-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/input-device.json
new file mode 100644
index 0000000000..2bced15499
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/input-device.json
@@ -0,0 +1,104 @@
+{
+  "id": "bf2be3c32ea4d8f561ujmu",
+  "name": "Chauffage cabinet",
+  "product_name": "LSC Power Plug FR incl. Power meter",
+  "product_id": "b61eihfqeaexn54g",
+  "local_key": "local-key",
+  "ip": "192.168.1.50",
+  "cloud_ip": "91.0.0.1",
+  "protocol_version": "3.5",
+  "local_override": true,
+  "online": true,
+  "specifications": {
+    "category": "cz",
+    "functions": [
+      {
+        "code": "switch_1",
+        "name": "Switch 1",
+        "type": "Boolean",
+        "values": "{}"
+      },
+      {
+        "code": "child_lock",
+        "name": "Child Lock",
+        "type": "Boolean",
+        "values": "{}"
+      }
+    ],
+    "status": [
+      {
+        "code": "switch_1",
+        "name": "Switch 1",
+        "type": "Boolean",
+        "values": "{}"
+      },
+      {
+        "code": "add_ele",
+        "name": "Electricity",
+        "type": "Integer",
+        "values": "{\"min\":0,\"max\":50000,\"scale\":3,\"step\":100}"
+      },
+      {
+        "code": "cur_current",
+        "name": "Current",
+        "type": "Integer",
+        "values": "{\"unit\":\"mA\",\"min\":0,\"max\":30000,\"scale\":0,\"step\":1}"
+      },
+      {
+        "code": "cur_power",
+        "name": "Power",
+        "type": "Integer",
+        "values": "{\"unit\":\"W\",\"min\":0,\"max\":80000,\"scale\":1,\"step\":1}"
+      },
+      {
+        "code": "cur_voltage",
+        "name": "Voltage",
+        "type": "Integer",
+        "values": "{\"unit\":\"V\",\"min\":0,\"max\":5000,\"scale\":1,\"step\":1}"
+      },
+      {
+        "code": "child_lock",
+        "name": "Child Lock",
+        "type": "Boolean",
+        "values": "{}"
+      }
+    ]
+  },
+  "properties": {
+    "properties": [
+      {
+        "code": "switch_1",
+        "dp_id": 1,
+        "value": false
+      },
+      {
+        "code": "add_ele",
+        "dp_id": 17,
+        "value": 1
+      },
+      {
+        "code": "cur_current",
+        "dp_id": 18,
+        "value": 0
+      },
+      {
+        "code": "cur_power",
+        "dp_id": 19,
+        "value": 0
+      },
+      {
+        "code": "cur_voltage",
+        "dp_id": 20,
+        "value": 2340
+      },
+      {
+        "code": "child_lock",
+        "dp_id": 41,
+        "value": false
+      }
+    ]
+  },
+  "thing_model": {
+    "services": []
+  }
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/local-dps.json b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/local-dps.json
new file mode 100644
index 0000000000..044914519d
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/local-dps.json
@@ -0,0 +1,18 @@
+{
+  "1": false,
+  "9": 0,
+  "18": 0,
+  "19": 0,
+  "20": 2268,
+  "21": 1,
+  "22": 566,
+  "23": 26471,
+  "24": 14621,
+  "25": 2840,
+  "26": 0,
+  "38": "memory",
+  "39": false,
+  "40": "relay",
+  "41": false,
+  "44": ""
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/manifest.js b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/manifest.js
new file mode 100644
index 0000000000..d8f7c45216
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/manifest.js
@@ -0,0 +1,32 @@
+module.exports = {
+  name: 'LSC Power Plug FR incl. Power meter',
+  convertDevice: {
+    input: './input-device.json',
+    expected: './expected-device.json',
+  },
+  pollCloud: {
+    device: './poll-device.json',
+    response: './cloud-status.json',
+    expectedEvents: './expected-cloud-events.json',
+  },
+  pollLocal: {
+    device: './poll-device.json',
+    dps: './local-dps.json',
+    expectedEvents: './expected-local-events.json',
+    expectedCloudRequests: 1,
+  },
+  localMapping: {
+    device: './poll-device.json',
+    expected: './expected-local-mapping.json',
+  },
+  setValueLocal: {
+    device: './poll-device.json',
+    featureExternalId: 'tuya:bf2be3c32ea4d8f561ujmu:switch_1',
+    inputValue: 1,
+    expectedLocalSet: {
+      dps: 1,
+      set: true,
+    },
+    expectedCloudRequests: 0,
+  },
+};
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/poll-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/poll-device.json
new file mode 100644
index 0000000000..7cca7f8253
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/poll-device.json
@@ -0,0 +1,92 @@
+{
+  "external_id": "tuya:bf2be3c32ea4d8f561ujmu",
+  "device_type": "smart-socket",
+  "properties": {
+    "properties": [
+      {
+        "code": "switch_1",
+        "dp_id": 1,
+        "value": false
+      },
+      {
+        "code": "add_ele",
+        "dp_id": 17,
+        "value": 1
+      },
+      {
+        "code": "cur_current",
+        "dp_id": 18,
+        "value": 0
+      },
+      {
+        "code": "cur_power",
+        "dp_id": 19,
+        "value": 0
+      },
+      {
+        "code": "cur_voltage",
+        "dp_id": 20,
+        "value": 2340
+      },
+      {
+        "code": "child_lock",
+        "dp_id": 41,
+        "value": false
+      }
+    ]
+  },
+  "params": [
+    { "name": "IP_ADDRESS", "value": "192.168.1.50" },
+    { "name": "LOCAL_KEY", "value": "local-key" },
+    { "name": "PROTOCOL_VERSION", "value": "3.5" },
+    { "name": "LOCAL_OVERRIDE", "value": true }
+  ],
+  "features": [
+    {
+      "external_id": "tuya:bf2be3c32ea4d8f561ujmu:switch_1",
+      "selector": "tuya:bf2be3c32ea4d8f561ujmu:switch_1",
+      "category": "switch",
+      "type": "binary",
+      "last_value": 1
+    },
+    {
+      "external_id": "tuya:bf2be3c32ea4d8f561ujmu:child_lock",
+      "selector": "tuya:bf2be3c32ea4d8f561ujmu:child_lock",
+      "category": "child-lock",
+      "type": "binary",
+      "last_value": 1
+    },
+    {
+      "external_id": "tuya:bf2be3c32ea4d8f561ujmu:add_ele",
+      "selector": "tuya:bf2be3c32ea4d8f561ujmu:add_ele",
+      "category": "switch",
+      "type": "energy",
+      "scale": 3,
+      "last_value": 0
+    },
+    {
+      "external_id": "tuya:bf2be3c32ea4d8f561ujmu:cur_current",
+      "selector": "tuya:bf2be3c32ea4d8f561ujmu:cur_current",
+      "category": "switch",
+      "type": "current",
+      "scale": 0,
+      "last_value": 1
+    },
+    {
+      "external_id": "tuya:bf2be3c32ea4d8f561ujmu:cur_power",
+      "selector": "tuya:bf2be3c32ea4d8f561ujmu:cur_power",
+      "category": "switch",
+      "type": "power",
+      "scale": 1,
+      "last_value": 1
+    },
+    {
+      "external_id": "tuya:bf2be3c32ea4d8f561ujmu:cur_voltage",
+      "selector": "tuya:bf2be3c32ea4d8f561ujmu:cur_voltage",
+      "category": "switch",
+      "type": "voltage",
+      "scale": 1,
+      "last_value": 1
+    }
+  ]
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-local-mapping.json b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-local-mapping.json
index 468886a9a1..3b55eb5d9b 100644
--- a/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-local-mapping.json
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-local-mapping.json
@@ -1,4 +1,4 @@
 {
   "switch_1": 1,
-  "cur_power": null
+  "cur_power": 19
 }
diff --git a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
index 7cbfdf96ec..37d9d8199a 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
@@ -24,6 +24,10 @@ describe('Tuya device mapping', () => {
       const result = writeValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.BINARY](1);
       expect(result).to.eq(true);
     });
+    it('child lock binary', () => {
+      const result = writeValues[DEVICE_FEATURE_CATEGORIES.CHILD_LOCK][DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY](1);
+      expect(result).to.eq(true);
+    });
     describe('curtain state', () => {
       it('open', () => {
         const result = writeValues[DEVICE_FEATURE_CATEGORIES.CURTAIN][DEVICE_FEATURE_TYPES.CURTAIN.STATE](
@@ -90,6 +94,10 @@ describe('Tuya device mapping', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.BINARY]('ON');
         expect(result).to.eq(1);
       });
+      it('child lock', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.CHILD_LOCK][DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY]('true');
+        expect(result).to.eq(1);
+      });
       it('energy', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.ENERGY]('30');
         expect(result).to.eq(0.3);
diff --git a/server/test/services/tuya/lib/device/tuya.localMapping.test.js b/server/test/services/tuya/lib/device/tuya.localMapping.test.js
index 01d884080a..d23c64b49a 100644
--- a/server/test/services/tuya/lib/device/tuya.localMapping.test.js
+++ b/server/test/services/tuya/lib/device/tuya.localMapping.test.js
@@ -67,6 +67,16 @@ describe('Tuya local mapping', () => {
     expect(dpsKey).to.equal(null);
   });
 
+  it('should resolve smart socket telemetry dps in strict local mapping', () => {
+    const device = { device_type: 'smart-socket' };
+
+    expect(getLocalDpsFromCode('add_ele', device)).to.equal(17);
+    expect(getLocalDpsFromCode('cur_current', device)).to.equal(18);
+    expect(getLocalDpsFromCode('cur_power', device)).to.equal(19);
+    expect(getLocalDpsFromCode('cur_voltage', device)).to.equal(20);
+    expect(getLocalDpsFromCode('child_lock', device)).to.equal(41);
+  });
+
   it('should fallback to switch dps in non-strict mapping without dps', () => {
     const { getLocalDpsFromCode: getLocalDpsFromCodeStub } = proxyquire(
       '../../../../../services/tuya/lib/device/tuya.localMapping',
diff --git a/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js b/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js
index b65a965788..bd8e0ccfe3 100644
--- a/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.fixtures.test.js
@@ -32,7 +32,7 @@ describe('TuyaHandler.setValue fixtures', () => {
 
       const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
         tuyapi: TuyAPIStub,
-        '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
+        '@demirdeniz/tuyapi-newgen': TuyAPIStub,
       });
 
       const {

From b2cc02d2d1bc5309e804b4b0fb49c85cfa15c715 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Mon, 2 Mar 2026 09:58:47 +0100
Subject: [PATCH 80/90] Fix Tuya loadDeviceDetails null-report test

---
 .../services/tuya/lib/tuya.loadDeviceDetails.test.js  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
index 8faaa90448..757b956726 100644
--- a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
@@ -365,6 +365,17 @@ describe('TuyaHandler.loadDeviceDetails', () => {
       specifications: {},
       properties: {},
       thing_model: null,
+      tuya_report: buildExpectedReport({
+        deviceId: 1,
+        listEntry: { id: 1 },
+        specificationResponse: null,
+        detailsResponse: null,
+        propertiesResponse: null,
+        modelResponse: null,
+        specifications: {},
+        properties: {},
+        thingModel: null,
+      }),
     });
   });
 });

From b4830995780836af05c472cd2c9f3080859f769f Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Mon, 2 Mar 2026 10:34:51 +0100
Subject: [PATCH 81/90] Refine Tuya smart socket ignored mappings

---
 .../tuya/lib/mappings/cloud/smart-socket.js   |  16 +-
 .../tuya/lib/mappings/local/smart-socket.js   |   2 +-
 .../expected-device.json                      |  18 +-
 .../smart-socket-basic/expected-device.json   |  18 +-
 .../lib/device/tuya.convertDevice.test.js     |   7 +-
 .../tuya/lib/tuya.discoverDevices.test.js     | 348 +++++++++---------
 6 files changed, 226 insertions(+), 183 deletions(-)

diff --git a/server/services/tuya/lib/mappings/cloud/smart-socket.js b/server/services/tuya/lib/mappings/cloud/smart-socket.js
index c42d502fdd..49c7127bfa 100644
--- a/server/services/tuya/lib/mappings/cloud/smart-socket.js
+++ b/server/services/tuya/lib/mappings/cloud/smart-socket.js
@@ -5,7 +5,21 @@ const {
 } = require('../../../../../utils/constants');
 
 module.exports = {
-  ignoredCodes: ['countdown', 'countdown_1'],
+  ignoredCodes: [
+    'countdown',
+    'countdown_1',
+    'relay_status',
+    'overcharge_switch',
+    'light_mode',
+    'cycle_time',
+    'random_time',
+    'switch_inching',
+    'voltage_coe',
+    'electric_coe',
+    'power_coe',
+    'electricity_coe',
+    'test_bit',
+  ],
   switch: {
     category: DEVICE_FEATURE_CATEGORIES.SWITCH,
     type: DEVICE_FEATURE_TYPES.SWITCH.BINARY,
diff --git a/server/services/tuya/lib/mappings/local/smart-socket.js b/server/services/tuya/lib/mappings/local/smart-socket.js
index f4d7e1ef79..7419ddba10 100644
--- a/server/services/tuya/lib/mappings/local/smart-socket.js
+++ b/server/services/tuya/lib/mappings/local/smart-socket.js
@@ -1,6 +1,6 @@
 module.exports = {
   strict: true,
-  ignoredDps: ['11'],
+  ignoredDps: ['9', '11', '21', '22', '23', '24', '25', '38', '39', '40', '42', '43', '44'],
   codeAliases: {
     child_lock: [],
     switch: ['power'],
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
index d81a99ce7a..b0627a4ec7 100644
--- a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
@@ -18,8 +18,22 @@
     "PRODUCT_ID": "b61eihfqeaexn54g"
   },
   "tuya_mapping": {
-    "ignored_local_dps": ["11"],
-    "ignored_cloud_codes": ["countdown", "countdown_1"]
+    "ignored_local_dps": ["9", "11", "21", "22", "23", "24", "25", "38", "39", "40", "42", "43", "44"],
+    "ignored_cloud_codes": [
+      "countdown",
+      "countdown_1",
+      "relay_status",
+      "overcharge_switch",
+      "light_mode",
+      "cycle_time",
+      "random_time",
+      "switch_inching",
+      "voltage_coe",
+      "electric_coe",
+      "power_coe",
+      "electricity_coe",
+      "test_bit"
+    ]
   },
   "features": [
     {
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json
index 8d775e83e4..0097001b67 100644
--- a/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json
@@ -20,8 +20,22 @@
     "PRODUCT_KEY": "socket-key"
   },
   "tuya_mapping": {
-    "ignored_local_dps": ["11"],
-    "ignored_cloud_codes": ["countdown", "countdown_1"]
+    "ignored_local_dps": ["9", "11", "21", "22", "23", "24", "25", "38", "39", "40", "42", "43", "44"],
+    "ignored_cloud_codes": [
+      "countdown",
+      "countdown_1",
+      "relay_status",
+      "overcharge_switch",
+      "light_mode",
+      "cycle_time",
+      "random_time",
+      "switch_inching",
+      "voltage_coe",
+      "electric_coe",
+      "power_coe",
+      "electricity_coe",
+      "test_bit"
+    ]
   },
   "features": [
     {
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
index c7465337fa..f47808a598 100644
--- a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
@@ -42,10 +42,9 @@ describe('tuya.convertDevice', () => {
       functions: [{ code: 'switch_1', name: 'Switch', type: 'Boolean' }],
       status: [{ code: 'cur_power', name: 'Power', type: 'Integer' }],
     });
-    expect(device.tuya_mapping).to.deep.equal({
-      ignored_local_dps: ['11'],
-      ignored_cloud_codes: ['countdown', 'countdown_1'],
-    });
+    expect(device.tuya_mapping).to.be.an('object');
+    expect(device.tuya_mapping.ignored_local_dps).to.be.an('array');
+    expect(device.tuya_mapping.ignored_cloud_codes).to.be.an('array');
     expect(device.poll_frequency).to.equal(DEVICE_POLL_FREQUENCIES.EVERY_10_SECONDS);
 
     const params = device.params.reduce((acc, param) => {
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index 1c511b7e73..023304cb04 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -137,206 +137,208 @@ describe('TuyaHandler.discoverDevices', () => {
 
   it('should load devices', async () => {
     const devices = await tuyaHandler.discoverDevices();
-    expect(devices).to.deep.eq([
-      {
-        external_id: 'tuya:uuid',
-        features: [
-          {
-            category: 'switch',
-            external_id: 'tuya:uuid:cur_power',
-            has_feedback: false,
-            max: 1,
-            min: 0,
-            name: 'cur_power',
-            read_only: true,
-            selector: 'tuya:uuid:cur_power',
-            type: 'power',
-            unit: 'watt',
-          },
+    expect(devices).to.have.lengthOf(1);
+
+    const [{ tuya_mapping: tuyaMapping, ...device }] = devices;
+
+    expect(tuyaMapping).to.be.an('object');
+    expect(tuyaMapping.ignored_cloud_codes).to.be.an('array');
+    expect(tuyaMapping.ignored_local_dps).to.be.an('array');
+
+    expect(device).to.deep.eq({
+      external_id: 'tuya:uuid',
+      features: [
+        {
+          category: 'switch',
+          external_id: 'tuya:uuid:cur_power',
+          has_feedback: false,
+          max: 1,
+          min: 0,
+          name: 'cur_power',
+          read_only: true,
+          selector: 'tuya:uuid:cur_power',
+          type: 'power',
+          unit: 'watt',
+        },
+        {
+          category: 'switch',
+          external_id: 'tuya:uuid:switch_1',
+          has_feedback: false,
+          max: 1,
+          min: 0,
+          name: 'switch_1',
+          read_only: false,
+          selector: 'tuya:uuid:switch_1',
+          type: 'binary',
+        },
+      ],
+      device_type: 'smart-socket',
+      model: 'model',
+      name: 'name',
+      poll_frequency: 30000,
+      params: [
+        {
+          name: 'DEVICE_ID',
+          value: 'uuid',
+        },
+        {
+          name: 'LOCAL_KEY',
+          value: 'localKey',
+        },
+        {
+          name: 'CLOUD_IP',
+          value: '1.1.1.1',
+        },
+        {
+          name: 'LOCAL_OVERRIDE',
+          value: false,
+        },
+      ],
+      properties: {
+        properties: [{ code: 'switch_1', value: true }],
+      },
+      product_id: undefined,
+      product_key: undefined,
+      specifications: {
+        details: 'details',
+        category: 'cz',
+        functions: [
           {
-            category: 'switch',
-            external_id: 'tuya:uuid:switch_1',
-            has_feedback: false,
-            max: 1,
-            min: 0,
-            name: 'switch_1',
-            read_only: false,
-            selector: 'tuya:uuid:switch_1',
-            type: 'binary',
+            code: 'switch_1',
+            name: 'name',
+            type: 'Boolean',
           },
         ],
-        device_type: 'smart-socket',
-        model: 'model',
-        name: 'name',
-        poll_frequency: 30000,
-        params: [
-          {
-            name: 'DEVICE_ID',
-            value: 'uuid',
-          },
-          {
-            name: 'LOCAL_KEY',
-            value: 'localKey',
-          },
-          {
-            name: 'CLOUD_IP',
-            value: '1.1.1.1',
-          },
+        status: [
           {
-            name: 'LOCAL_OVERRIDE',
-            value: false,
+            code: 'cur_power',
+            name: 'cur_power',
+            type: 'Integer',
           },
         ],
-        properties: {
-          properties: [{ code: 'switch_1', value: true }],
-        },
-        product_id: undefined,
-        product_key: undefined,
-        specifications: {
-          details: 'details',
-          category: 'cz',
-          functions: [
-            {
-              code: 'switch_1',
-              name: 'name',
-              type: 'Boolean',
+      },
+      selector: 'tuya:uuid',
+      service_id: 'ffa13430-df93-488a-9733-5c540e9558e0',
+      should_poll: true,
+      thing_model: {
+        services: [],
+      },
+      tuya_report: {
+        schema_version: 2,
+        cloud: {
+          assembled: {
+            specifications: {
+              details: 'details',
+              category: 'cz',
+              functions: [
+                {
+                  code: 'switch_1',
+                  name: 'name',
+                  type: 'Boolean',
+                },
+              ],
+              status: [
+                {
+                  code: 'cur_power',
+                  name: 'cur_power',
+                  type: 'Integer',
+                },
+              ],
             },
-          ],
-          status: [
-            {
-              code: 'cur_power',
-              name: 'cur_power',
-              type: 'Integer',
+            properties: {
+              properties: [{ code: 'switch_1', value: true }],
             },
-          ],
-        },
-        selector: 'tuya:uuid',
-        service_id: 'ffa13430-df93-488a-9733-5c540e9558e0',
-        should_poll: true,
-        thing_model: {
-          services: [],
-        },
-        tuya_report: {
-          schema_version: 2,
-          cloud: {
-            assembled: {
-              specifications: {
-                details: 'details',
-                category: 'cz',
-                functions: [
-                  {
-                    code: 'switch_1',
-                    name: 'name',
-                    type: 'Boolean',
-                  },
-                ],
-                status: [
-                  {
-                    code: 'cur_power',
-                    name: 'cur_power',
-                    type: 'Integer',
-                  },
-                ],
-              },
-              properties: {
-                properties: [{ code: 'switch_1', value: true }],
+            thing_model: {
+              services: [],
+            },
+          },
+          raw: {
+            device_list_entry: {
+              request: {
+                method: 'GET',
+                path: '/v1.0/users/{sourceId}/devices',
               },
-              thing_model: {
-                services: [],
+              response_item: {
+                name: 'name',
+                id: 'uuid',
+                product_name: 'model',
+                local_key: 'localKey',
+                ip: '1.1.1.1',
+                online: true,
               },
             },
-            raw: {
-              device_list_entry: {
-                request: {
-                  method: 'GET',
-                  path: '/v1.0/users/{sourceId}/devices',
+            device_specification: {
+              request: {
+                method: 'GET',
+                path: `${API.VERSION_1_2}/devices/uuid/specification`,
+              },
+              response: {
+                result: {
+                  details: 'details',
+                  functions: [
+                    {
+                      name: 'name',
+                      code: 'switch_1',
+                      type: 'Boolean',
+                    },
+                  ],
+                  status: [
+                    {
+                      name: 'cur_power',
+                      code: 'cur_power',
+                      type: 'Integer',
+                    },
+                  ],
+                  category: 'cz',
                 },
-                response_item: {
-                  name: 'name',
-                  id: 'uuid',
-                  product_name: 'model',
+              },
+              error: null,
+            },
+            device_details: {
+              request: {
+                method: 'GET',
+                path: `${API.VERSION_1_0}/devices/uuid`,
+              },
+              response: {
+                result: {
                   local_key: 'localKey',
                   ip: '1.1.1.1',
-                  online: true,
                 },
               },
-              device_specification: {
-                request: {
-                  method: 'GET',
-                  path: `${API.VERSION_1_2}/devices/uuid/specification`,
-                },
-                response: {
-                  result: {
-                    details: 'details',
-                    functions: [
-                      {
-                        name: 'name',
-                        code: 'switch_1',
-                        type: 'Boolean',
-                      },
-                    ],
-                    status: [
-                      {
-                        name: 'cur_power',
-                        code: 'cur_power',
-                        type: 'Integer',
-                      },
-                    ],
-                    category: 'cz',
-                  },
-                },
-                error: null,
+              error: null,
+            },
+            thing_shadow_properties: {
+              request: {
+                method: 'GET',
+                path: `${API.VERSION_2_0}/thing/uuid/shadow/properties`,
               },
-              device_details: {
-                request: {
-                  method: 'GET',
-                  path: `${API.VERSION_1_0}/devices/uuid`,
-                },
-                response: {
-                  result: {
-                    local_key: 'localKey',
-                    ip: '1.1.1.1',
-                  },
+              response: {
+                result: {
+                  properties: [{ code: 'switch_1', value: true }],
                 },
-                error: null,
               },
-              thing_shadow_properties: {
-                request: {
-                  method: 'GET',
-                  path: `${API.VERSION_2_0}/thing/uuid/shadow/properties`,
-                },
-                response: {
-                  result: {
-                    properties: [{ code: 'switch_1', value: true }],
-                  },
-                },
-                error: null,
+              error: null,
+            },
+            thing_model: {
+              request: {
+                method: 'GET',
+                path: `${API.VERSION_2_0}/thing/uuid/model`,
               },
-              thing_model: {
-                request: {
-                  method: 'GET',
-                  path: `${API.VERSION_2_0}/thing/uuid/model`,
-                },
-                response: {
-                  result: {
-                    model: '{"services":[]}',
-                  },
+              response: {
+                result: {
+                  model: '{"services":[]}',
                 },
-                error: null,
               },
+              error: null,
             },
           },
-          local: {
-            scan: null,
-          },
         },
-        tuya_mapping: {
-          ignored_cloud_codes: ['countdown', 'countdown_1'],
-          ignored_local_dps: ['11'],
+        local: {
+          scan: null,
         },
-        online: true,
       },
-    ]);
+      online: true,
+    });
 
     assert.callCount(gladys.event.emit, 2);
     assert.calledWith(gladys.event.emit, EVENTS.WEBSOCKET.SEND_ALL, {

From 3171274a04153b01247696c698c63499f5190209 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Mon, 2 Mar 2026 12:04:07 +0100
Subject: [PATCH 82/90] test(tuya): harden local scan and cloud loading cases

---
 .../test/services/tuya/lib/tuya.init.test.js  |  45 ++++
 .../tuya/lib/tuya.loadDeviceDetails.test.js   |  56 +++++
 .../tuya/lib/tuya.loadDevices.test.js         |  41 +++
 .../services/tuya/lib/tuya.localScan.test.js  | 237 ++++++++++++++++++
 4 files changed, 379 insertions(+)

diff --git a/server/test/services/tuya/lib/tuya.init.test.js b/server/test/services/tuya/lib/tuya.init.test.js
index adb241841e..4c3ab52a78 100644
--- a/server/test/services/tuya/lib/tuya.init.test.js
+++ b/server/test/services/tuya/lib/tuya.init.test.js
@@ -31,6 +31,8 @@ describe('TuyaHandler.init', () => {
   beforeEach(() => {
     sinon.reset();
     tuyaHandler.status = 'UNKNOWN';
+    tuyaHandler.autoReconnectAllowed = false;
+    tuyaHandler.lastError = 'previous-error';
   });
 
   afterEach(() => {
@@ -107,4 +109,47 @@ describe('TuyaHandler.init', () => {
       payload: { status: STATUS.NOT_INITIALIZED, manual_disconnect: true },
     });
   });
+
+  it('should allow auto-reconnect when last connected hash matches current config', async () => {
+    gladys.variable.getValue
+      .withArgs(GLADYS_VARIABLES.ENDPOINT, serviceId)
+      .returns('apiUrl')
+      .withArgs(GLADYS_VARIABLES.ACCESS_KEY, serviceId)
+      .returns('accessKey')
+      .withArgs(GLADYS_VARIABLES.SECRET_KEY, serviceId)
+      .returns('secretKey')
+      .withArgs(GLADYS_VARIABLES.APP_ACCOUNT_UID, serviceId)
+      .returns('appAccountId')
+      .withArgs(GLADYS_VARIABLES.APP_USERNAME, serviceId)
+      .returns('appUsername')
+      .withArgs(GLADYS_VARIABLES.LAST_CONNECTED_CONFIG_HASH, serviceId)
+      .returns('9fa6af9a941ec217207b27f44ce07efcb447bb2173f4ce8f238a2aeb7ad9f8ea')
+      .withArgs(GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId)
+      .returns(false);
+
+    await tuyaHandler.init();
+
+    expect(tuyaHandler.autoReconnectAllowed).to.equal(true);
+    assert.calledOnce(client.init);
+  });
+
+  it('should connect with null configuration when no config is stored', async () => {
+    const connectStub = sinon.stub(tuyaHandler, 'connect').resolves();
+    const getConfigurationStub = sinon.stub(tuyaHandler, 'getConfiguration').resolves(null);
+    gladys.variable.getValue
+      .withArgs(GLADYS_VARIABLES.LAST_CONNECTED_CONFIG_HASH, serviceId)
+      .returns('some-hash')
+      .withArgs(GLADYS_VARIABLES.MANUAL_DISCONNECT, serviceId)
+      .returns(0);
+
+    await tuyaHandler.init();
+
+    expect(tuyaHandler.autoReconnectAllowed).to.equal(false);
+    assert.calledOnce(getConfigurationStub);
+    assert.calledOnce(connectStub);
+    assert.calledWith(connectStub, null);
+
+    connectStub.restore();
+    getConfigurationStub.restore();
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
index 757b956726..2fdb448f30 100644
--- a/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDeviceDetails.test.js
@@ -378,4 +378,60 @@ describe('TuyaHandler.loadDeviceDetails', () => {
       }),
     });
   });
+
+  it('should use raw rejection reasons when requests reject without Error instances', async () => {
+    const warnStub = sinon.stub(logger, 'warn');
+    tuyaHandler.connector.request = sinon
+      .stub()
+      .onCall(0)
+      .rejects('specification failure')
+      .onCall(1)
+      .rejects('details failure')
+      .onCall(2)
+      .rejects('properties failure')
+      .onCall(3)
+      .rejects('model failure');
+
+    const device = await tuyaHandler.loadDeviceDetails({ id: 1 });
+
+    expect(device.id).to.equal(1);
+    expect(device.specifications).to.deep.equal({});
+    expect(device.properties).to.deep.equal({});
+    expect(device.thing_model).to.equal(null);
+    expect(device.tuya_report.cloud.assembled).to.deep.equal({
+      specifications: {},
+      properties: {},
+      thing_model: null,
+    });
+    expect(String(device.tuya_report.cloud.raw.device_specification.error)).to.equal('specification failure');
+    expect(String(device.tuya_report.cloud.raw.device_details.error)).to.equal('details failure');
+    expect(String(device.tuya_report.cloud.raw.thing_shadow_properties.error)).to.equal('properties failure');
+    expect(String(device.tuya_report.cloud.raw.thing_model.error)).to.equal('model failure');
+    expect(warnStub.callCount).to.equal(4);
+  });
+
+  it('should handle fulfilled responses without result payload', async () => {
+    tuyaHandler.connector.request = sinon.stub().resolves({});
+
+    const device = await tuyaHandler.loadDeviceDetails({ id: 1, category: 'switch' });
+
+    expect(device).to.deep.eq({
+      id: 1,
+      category: 'switch',
+      specifications: { category: 'switch' },
+      properties: {},
+      thing_model: null,
+      tuya_report: buildExpectedReport({
+        deviceId: 1,
+        listEntry: { id: 1, category: 'switch' },
+        specificationResponse: {},
+        detailsResponse: {},
+        propertiesResponse: {},
+        modelResponse: {},
+        specifications: { category: 'switch' },
+        properties: {},
+        thingModel: null,
+      }),
+    });
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.loadDevices.test.js b/server/test/services/tuya/lib/tuya.loadDevices.test.js
index 4219823287..36d4646987 100644
--- a/server/test/services/tuya/lib/tuya.loadDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.loadDevices.test.js
@@ -97,6 +97,47 @@ describe('TuyaHandler.loadDevices', () => {
     }
   });
 
+  it('should use error message field when msg is missing', async () => {
+    tuyaHandler.connector.request = sinon.stub().resolves({
+      success: false,
+      message: 'Tuya message error',
+    });
+
+    try {
+      await tuyaHandler.loadDevices(1, 1);
+      assert.fail();
+    } catch (e) {
+      expect(e.message).to.equal('Tuya message error');
+    }
+  });
+
+  it('should use error code field when msg and message are missing', async () => {
+    tuyaHandler.connector.request = sinon.stub().resolves({
+      success: false,
+      code: 'TUYA_ERR_CODE',
+    });
+
+    try {
+      await tuyaHandler.loadDevices(1, 1);
+      assert.fail();
+    } catch (e) {
+      expect(e.message).to.equal('TUYA_ERR_CODE');
+    }
+  });
+
+  it('should fallback to default api error message when error payload is empty', async () => {
+    tuyaHandler.connector.request = sinon.stub().resolves({
+      success: false,
+    });
+
+    try {
+      await tuyaHandler.loadDevices(1, 1);
+      assert.fail();
+    } catch (e) {
+      expect(e.message).to.equal('Tuya API error');
+    }
+  });
+
   it('should throw on empty api response', async () => {
     tuyaHandler.connector.request = sinon.stub().resolves(null);
 
diff --git a/server/test/services/tuya/lib/tuya.localScan.test.js b/server/test/services/tuya/lib/tuya.localScan.test.js
index c7eecea7a7..3976108e79 100644
--- a/server/test/services/tuya/lib/tuya.localScan.test.js
+++ b/server/test/services/tuya/lib/tuya.localScan.test.js
@@ -366,6 +366,212 @@ describe('TuyaHandler.localScan', () => {
       portErrors: {},
     });
   });
+
+  it('should support object input and ignore parser results that return null', async () => {
+    const sockets = [];
+    const dgramStub = {
+      createSocket: () => {
+        const handlers = {};
+        const socket = {
+          on: (event, cb) => {
+            handlers[event] = cb;
+          },
+          bind: (options, cb) => {
+            if (typeof options === 'function') {
+              options();
+              return;
+            }
+            if (cb) {
+              cb();
+            }
+          },
+          close: () => {},
+          handlers,
+        };
+        sockets.push(socket);
+        return socket;
+      },
+    };
+
+    class MessageParserStub {
+      parse() {
+        return null;
+      }
+    }
+
+    const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
+      dgram: dgramStub,
+      '@demirdeniz/tuyapi-newgen/lib/message-parser': { MessageParser: MessageParserStub },
+      '@demirdeniz/tuyapi-newgen/lib/config': { UDP_KEY: 'key' },
+    });
+
+    const clock = sinon.useFakeTimers();
+    const promise = localScan({ timeoutSeconds: 1 });
+
+    sockets.forEach((socket) => {
+      if (socket.handlers.message) {
+        socket.handlers.message(null);
+      }
+    });
+
+    await clock.tickAsync(1100);
+    const result = await promise;
+    clock.restore();
+
+    expect(result).to.deep.equal({
+      devices: {},
+      portErrors: {},
+    });
+  });
+
+  it('should resolve device id from devId and fallback to rinfo address', async () => {
+    const sockets = [];
+    const dgramStub = {
+      createSocket: () => {
+        const handlers = {};
+        const socket = {
+          on: (event, cb) => {
+            handlers[event] = cb;
+          },
+          bind: (options, cb) => {
+            if (typeof options === 'function') {
+              options();
+              return;
+            }
+            if (cb) {
+              cb();
+            }
+          },
+          close: () => {},
+          handlers,
+        };
+        sockets.push(socket);
+        return socket;
+      },
+    };
+
+    class MessageParserStub {
+      parse() {
+        return [
+          {
+            payload: {
+              devId: 'device-dev-id',
+              version: '3.5',
+              productKey: 'product-key',
+            },
+          },
+        ];
+      }
+    }
+
+    const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
+      dgram: dgramStub,
+      '@demirdeniz/tuyapi-newgen/lib/message-parser': { MessageParser: MessageParserStub },
+      '@demirdeniz/tuyapi-newgen/lib/config': { UDP_KEY: 'key' },
+    });
+
+    const clock = sinon.useFakeTimers();
+    const promise = localScan(1);
+
+    sockets.forEach((socket) => {
+      if (socket.handlers.message) {
+        socket.handlers.message(Buffer.from('test'), {
+          address: '9.9.9.9',
+          port: 6666,
+          source: 'lan',
+        });
+      }
+    });
+
+    await clock.tickAsync(1100);
+    const result = await promise;
+    clock.restore();
+
+    expect(result).to.deep.equal({
+      devices: {
+        'device-dev-id': {
+          ip: '9.9.9.9',
+          version: '3.5',
+          productKey: 'product-key',
+        },
+      },
+      portErrors: {},
+    });
+  });
+
+  it('should resolve device id from payload id when gwId and devId are missing', async () => {
+    const sockets = [];
+    const dgramStub = {
+      createSocket: () => {
+        const handlers = {};
+        const socket = {
+          on: (event, cb) => {
+            handlers[event] = cb;
+          },
+          bind: (options, cb) => {
+            if (typeof options === 'function') {
+              options();
+              return;
+            }
+            if (cb) {
+              cb();
+            }
+          },
+          close: () => {},
+          handlers,
+        };
+        sockets.push(socket);
+        return socket;
+      },
+    };
+
+    class MessageParserStub {
+      parse() {
+        return [
+          {
+            payload: {
+              id: 'device-payload-id',
+              ip: '8.8.8.8',
+              version: '3.3',
+            },
+          },
+        ];
+      }
+    }
+
+    const { localScan } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
+      dgram: dgramStub,
+      '@demirdeniz/tuyapi-newgen/lib/message-parser': { MessageParser: MessageParserStub },
+      '@demirdeniz/tuyapi-newgen/lib/config': { UDP_KEY: 'key' },
+    });
+
+    const clock = sinon.useFakeTimers();
+    const promise = localScan(1);
+
+    sockets.forEach((socket) => {
+      if (socket.handlers.message) {
+        socket.handlers.message(Buffer.from('test'), {
+          address: '7.7.7.7',
+          port: 6667,
+        });
+      }
+    });
+
+    await clock.tickAsync(1100);
+    const result = await promise;
+    clock.restore();
+
+    expect(result).to.deep.equal({
+      devices: {
+        'device-payload-id': {
+          ip: '8.8.8.8',
+          version: '3.3',
+          productKey: undefined,
+        },
+      },
+      portErrors: {},
+    });
+  });
 });
 
 describe('TuyaHandler.buildLocalScanResponse', () => {
@@ -506,4 +712,35 @@ describe('TuyaHandler.buildLocalScanResponse', () => {
       response: { ip: '2.2.2.2', version: '3.3', productKey: 'pkey' },
     });
   });
+
+  it('should keep local device name when creating a local-only discovered device', () => {
+    const convertDevice = sinon.stub().callsFake((device) => ({
+      external_id: `tuya:${device.id}`,
+      name: device.name,
+      params: [{ name: 'IP_ADDRESS', value: device.ip }],
+      tuya_report: mergeTuyaReport(null, device.tuya_report),
+    }));
+    const { buildLocalScanResponse } = proxyquire('../../../../services/tuya/lib/tuya.localScan', {
+      './device/tuya.convertDevice': {
+        convertDevice,
+      },
+    });
+    const tuyaManager = {
+      discoveredDevices: [],
+      gladys: {
+        stateManager: {
+          get: sinon.stub().returns(null),
+        },
+      },
+    };
+
+    const response = buildLocalScanResponse(tuyaManager, {
+      devices: { device3: { name: 'Kitchen Plug', ip: '3.3.3.3', version: '3.5' } },
+      portErrors: {},
+    });
+
+    expect(convertDevice.calledOnce).to.equal(true);
+    expect(convertDevice.firstCall.args[0].name).to.equal('Kitchen Plug');
+    expect(response.devices[0].name).to.equal('Kitchen Plug');
+  });
 });

From 2ca5a626e6dd22db86521ed23588c51dd9723b09 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Tue, 3 Mar 2026 07:29:03 +0100
Subject: [PATCH 83/90] feat(tuya): support cloud shadow reads for thing-model
 devices

---
 .../tuya/lib/device/tuya.convertDevice.js     | 29 ++++----
 server/services/tuya/lib/tuya.poll.js         | 52 ++++++++++----
 .../tuya/lib/utils/tuya.cloudStrategy.js      | 55 +++++++++++++++
 .../services/tuya/lib/utils/tuya.constants.js |  1 +
 .../cloud-status.json                         | 68 ++++++++++---------
 .../expected-device.json                      |  1 +
 .../poll-device.json                          |  1 +
 .../smart-socket-basic/expected-device.json   |  1 +
 .../lib/device/tuya.convertDevice.test.js     |  6 ++
 .../tuya/lib/tuya.discoverDevices.test.js     |  4 ++
 .../test/services/tuya/lib/tuya.poll.test.js  | 32 +++++++++
 11 files changed, 190 insertions(+), 60 deletions(-)
 create mode 100644 server/services/tuya/lib/utils/tuya.cloudStrategy.js

diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index 91c1c4aa7c..14c417fb57 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -1,6 +1,7 @@
 const { DEVICE_POLL_FREQUENCIES } = require('../../../../utils/constants');
 const { DEVICE_PARAM_NAME } = require('../utils/tuya.constants');
 const { normalizeBoolean } = require('../utils/tuya.normalize');
+const { resolveCloudReadStrategy } = require('../utils/tuya.cloudStrategy');
 const { mergeTuyaReport } = require('../utils/tuya.report');
 const { convertFeature } = require('./tuya.convertFeature');
 const { getDeviceType, getIgnoredCloudCodes, getIgnoredLocalDps } = require('../mappings');
@@ -37,6 +38,19 @@ function convertDevice(tuyaDevice) {
   const online = tuyaDevice.online !== undefined ? tuyaDevice.online : tuyaDevice.is_online;
   const normalizedLocalOverride = normalizeBoolean(localOverride);
 
+  logger.debug(`Tuya convert device "${name}, ${productName || model}"`);
+  const deviceType = getDeviceType({
+    specifications,
+    model,
+    product_name: productName,
+    product_id: productId,
+    name,
+    category: specifications.category || category,
+    properties,
+    thing_model: thingModel,
+  });
+  const cloudReadStrategy = resolveCloudReadStrategy(tuyaDevice, deviceType);
+
   const params = [];
   if (id) {
     params.push({ name: DEVICE_PARAM_NAME.DEVICE_ID, value: id });
@@ -62,6 +76,9 @@ function convertDevice(tuyaDevice) {
   if (productKey) {
     params.push({ name: DEVICE_PARAM_NAME.PRODUCT_KEY, value: productKey });
   }
+  if (cloudReadStrategy) {
+    params.push({ name: DEVICE_PARAM_NAME.CLOUD_READ_STRATEGY, value: cloudReadStrategy });
+  }
   const safeDeviceLog = {
     id,
     name,
@@ -74,18 +91,6 @@ function convertDevice(tuyaDevice) {
   logger.debug('Tuya convert device specifications');
   logger.debug(JSON.stringify(safeDeviceLog));
 
-  logger.debug(`Tuya convert device "${name}, ${productName || model}"`);
-  const deviceType = getDeviceType({
-    specifications,
-    model,
-    product_name: productName,
-    product_id: productId,
-    name,
-    category: specifications.category || category,
-    properties,
-    thing_model: thingModel,
-  });
-
   // Groups cloud specification entries first, then thing model properties, then current property shadow codes.
   const groups = {};
   status.forEach((stat) => {
diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index 886e88522a..4a75345d38 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -3,6 +3,7 @@ const logger = require('../../../utils/logger');
 const { readValues } = require('./device/tuya.deviceMapping');
 const { API, DEVICE_PARAM_NAME } = require('./utils/tuya.constants');
 const { EVENTS } = require('../../../utils/constants');
+const { CLOUD_STRATEGY, getConfiguredCloudReadStrategy } = require('./utils/tuya.cloudStrategy');
 const { normalizeBoolean } = require('./utils/tuya.normalize');
 const { getParamValue } = require('./utils/tuya.deviceParams');
 const { localPoll } = require('./tuya.localPoll');
@@ -96,7 +97,25 @@ const emitFeatureState = (gladys, deviceFeature, transformedValue, previousValue
   return { emitted, changed };
 };
 
-const pollCloudFeatures = async function pollCloudFeatures(deviceFeatures, topic) {
+const extractValuesFromResultArray = (result) => {
+  const values = {};
+  const entries = Array.isArray(result) ? result : [];
+  entries.forEach((feature) => {
+    if (!feature || typeof feature !== 'object' || feature.code === undefined || feature.code === null) {
+      return;
+    }
+    values[String(feature.code)] = feature.value;
+  });
+  return values;
+};
+
+const extractShadowValues = (response) => {
+  const payload = response && response.result;
+  const properties = payload && Array.isArray(payload.properties) ? payload.properties : [];
+  return extractValuesFromResultArray(properties);
+};
+
+const pollCloudFeatures = async function pollCloudFeatures(device, deviceFeatures, topic) {
   const summary = {
     polled: Array.isArray(deviceFeatures) ? deviceFeatures.length : 0,
     handled: 0,
@@ -113,19 +132,22 @@ const pollCloudFeatures = async function pollCloudFeatures(deviceFeatures, topic
     return summary;
   }
 
-  const response = await this.connector.request({
-    method: 'GET',
-    path: `${API.VERSION_1_0}/devices/${topic}/status`,
-  });
+  const cloudReadStrategy = getConfiguredCloudReadStrategy(device);
+  const response =
+    cloudReadStrategy === CLOUD_STRATEGY.SHADOW
+      ? await this.connector.request({
+          method: 'GET',
+          path: `${API.VERSION_2_0}/thing/${topic}/shadow/properties`,
+        })
+      : await this.connector.request({
+          method: 'GET',
+          path: `${API.VERSION_1_0}/devices/${topic}/status`,
+        });
 
-  const values = {};
-  const result = Array.isArray(response && response.result) ? response.result : [];
-  result.forEach((feature) => {
-    if (!feature || typeof feature !== 'object' || feature.code === undefined || feature.code === null) {
-      return;
-    }
-    values[String(feature.code)] = feature.value;
-  });
+  const values =
+    cloudReadStrategy === CLOUD_STRATEGY.SHADOW
+      ? extractShadowValues(response)
+      : extractValuesFromResultArray(response && response.result);
 
   deviceFeatures.forEach((deviceFeature) => {
     const code = getFeatureCode(deviceFeature);
@@ -283,7 +305,7 @@ async function poll(device) {
 
         fallbackReason = 'partial_local_mapping';
         try {
-          cloudSummary = await pollCloudFeatures.call(this, pendingCloudFeatures, topic);
+          cloudSummary = await pollCloudFeatures.call(this, device, pendingCloudFeatures, topic);
         } catch (e) {
           logger.warn(`[Tuya][poll] local poll succeeded but cloud fallback failed for ${topic}`, e);
           fallbackReason = 'cloud_fallback_failed';
@@ -304,7 +326,7 @@ async function poll(device) {
   }
 
   try {
-    cloudSummary = await pollCloudFeatures.call(this, deviceFeatures, topic);
+    cloudSummary = await pollCloudFeatures.call(this, device, deviceFeatures, topic);
   } catch (e) {
     logger.warn(`[Tuya][poll] cloud poll failed for ${topic}`, e);
     fallbackReason = fallbackReason === 'none' ? 'cloud_poll_failed' : `${fallbackReason}+cloud_poll_failed`;
diff --git a/server/services/tuya/lib/utils/tuya.cloudStrategy.js b/server/services/tuya/lib/utils/tuya.cloudStrategy.js
new file mode 100644
index 0000000000..97ac1f4671
--- /dev/null
+++ b/server/services/tuya/lib/utils/tuya.cloudStrategy.js
@@ -0,0 +1,55 @@
+const { DEVICE_PARAM_NAME } = require('./tuya.constants');
+const { getParamValue } = require('./tuya.deviceParams');
+const { getFeatureMapping, getIgnoredCloudCodes, normalizeCode } = require('../mappings');
+
+const CLOUD_STRATEGY = {
+  LEGACY: 'legacy',
+  SHADOW: 'shadow',
+};
+
+const isSupportedCloudCode = (code, deviceType, ignoredCloudCodes) => {
+  const normalizedCode = normalizeCode(code);
+  if (!normalizedCode) {
+    return false;
+  }
+  if (ignoredCloudCodes.includes(normalizedCode)) {
+    return false;
+  }
+  return Boolean(getFeatureMapping(normalizedCode, deviceType));
+};
+
+const getThingModelProperties = (device) => {
+  if (!device || !device.thing_model || !Array.isArray(device.thing_model.services)) {
+    return [];
+  }
+  return device.thing_model.services.flatMap((service) =>
+    Array.isArray(service && service.properties) ? service.properties : [],
+  );
+};
+
+const resolveCloudReadStrategy = (device, deviceType) => {
+  const ignoredCloudCodes = getIgnoredCloudCodes(deviceType);
+  const status = Array.isArray(device && device.specifications && device.specifications.status)
+    ? device.specifications.status
+    : [];
+  if (status.some((entry) => isSupportedCloudCode(entry && entry.code, deviceType, ignoredCloudCodes))) {
+    return CLOUD_STRATEGY.LEGACY;
+  }
+  const thingProperties = getThingModelProperties(device);
+  if (thingProperties.some((entry) => isSupportedCloudCode(entry && entry.code, deviceType, ignoredCloudCodes))) {
+    return CLOUD_STRATEGY.SHADOW;
+  }
+  return null;
+};
+
+const normalizeCloudStrategy = (value) =>
+  value === CLOUD_STRATEGY.SHADOW ? CLOUD_STRATEGY.SHADOW : CLOUD_STRATEGY.LEGACY;
+
+const getConfiguredCloudReadStrategy = (device) =>
+  normalizeCloudStrategy(getParamValue(device && device.params, DEVICE_PARAM_NAME.CLOUD_READ_STRATEGY));
+
+module.exports = {
+  CLOUD_STRATEGY,
+  getConfiguredCloudReadStrategy,
+  resolveCloudReadStrategy,
+};
diff --git a/server/services/tuya/lib/utils/tuya.constants.js b/server/services/tuya/lib/utils/tuya.constants.js
index def5025421..478599fbe7 100644
--- a/server/services/tuya/lib/utils/tuya.constants.js
+++ b/server/services/tuya/lib/utils/tuya.constants.js
@@ -42,6 +42,7 @@ const DEVICE_PARAM_NAME = {
   IP_ADDRESS: 'IP_ADDRESS',
   PROTOCOL_VERSION: 'PROTOCOL_VERSION',
   CLOUD_IP: 'CLOUD_IP',
+  CLOUD_READ_STRATEGY: 'CLOUD_READ_STRATEGY',
   LOCAL_OVERRIDE: 'LOCAL_OVERRIDE',
   PRODUCT_ID: 'PRODUCT_ID',
   PRODUCT_KEY: 'PRODUCT_KEY',
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/cloud-status.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/cloud-status.json
index 0e0e2f72dd..8011b92d7f 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/cloud-status.json
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/cloud-status.json
@@ -1,35 +1,37 @@
 {
-  "result": [
-    { "code": "power_a", "value": 706 },
-    { "code": "direction_a", "value": "FORWARD" },
-    { "code": "tbd", "value": false },
-    { "code": "direction_b", "value": "REVERSE" },
-    { "code": "power_b", "value": 0 },
-    { "code": "energy_forword_a", "value": 149241 },
-    { "code": "energy_reverse_a", "value": 43222 },
-    { "code": "energy_forword_b", "value": 0 },
-    { "code": "energy_reserse_b", "value": 0 },
-    { "code": "power_factor", "value": 73 },
-    { "code": "freq", "value": 4927 },
-    { "code": "voltage_a", "value": 2352 },
-    { "code": "current_a", "value": 410 },
-    { "code": "current_b", "value": 0 },
-    { "code": "total_power", "value": 706 },
-    { "code": "voltage_coef", "value": 1000 },
-    { "code": "current_a_calibration", "value": 1000 },
-    { "code": "power_a_calibration", "value": 1000 },
-    { "code": "energy_a_calibration_fwd", "value": 1000 },
-    { "code": "coef_a_reset", "value": false },
-    { "code": "power_factor_b", "value": 100 },
-    { "code": "freq_calibration", "value": 1000 },
-    { "code": "current_b_calibration", "value": 1000 },
-    { "code": "power_b_calibration", "value": 1000 },
-    { "code": "energy_b_calibration_fwd", "value": 1000 },
-    { "code": "coef_b_reset", "value": false },
-    { "code": "energy_a_calibration_rev", "value": 1000 },
-    { "code": "energy_b_calibration_rev", "value": 1000 },
-    { "code": "report_rate_control", "value": 10 },
-    { "code": "forward_energy_total", "value": 149241 },
-    { "code": "reverse_energy_total", "value": 43222 }
-  ]
+  "result": {
+    "properties": [
+      { "code": "power_a", "value": 706 },
+      { "code": "direction_a", "value": "FORWARD" },
+      { "code": "tbd", "value": false },
+      { "code": "direction_b", "value": "REVERSE" },
+      { "code": "power_b", "value": 0 },
+      { "code": "energy_forword_a", "value": 149241 },
+      { "code": "energy_reverse_a", "value": 43222 },
+      { "code": "energy_forword_b", "value": 0 },
+      { "code": "energy_reserse_b", "value": 0 },
+      { "code": "power_factor", "value": 73 },
+      { "code": "freq", "value": 4927 },
+      { "code": "voltage_a", "value": 2352 },
+      { "code": "current_a", "value": 410 },
+      { "code": "current_b", "value": 0 },
+      { "code": "total_power", "value": 706 },
+      { "code": "voltage_coef", "value": 1000 },
+      { "code": "current_a_calibration", "value": 1000 },
+      { "code": "power_a_calibration", "value": 1000 },
+      { "code": "energy_a_calibration_fwd", "value": 1000 },
+      { "code": "coef_a_reset", "value": false },
+      { "code": "power_factor_b", "value": 100 },
+      { "code": "freq_calibration", "value": 1000 },
+      { "code": "current_b_calibration", "value": 1000 },
+      { "code": "power_b_calibration", "value": 1000 },
+      { "code": "energy_b_calibration_fwd", "value": 1000 },
+      { "code": "coef_b_reset", "value": false },
+      { "code": "energy_a_calibration_rev", "value": 1000 },
+      { "code": "energy_b_calibration_rev", "value": 1000 },
+      { "code": "report_rate_control", "value": 10 },
+      { "code": "forward_energy_total", "value": 149241 },
+      { "code": "reverse_energy_total", "value": 43222 }
+    ]
+  }
 }
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
index 06c4e87b8b..94fc0f67ac 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
@@ -10,6 +10,7 @@
   "poll_frequency": 10000,
   "should_poll": true,
   "params": {
+    "CLOUD_READ_STRATEGY": "shadow",
     "DEVICE_ID": "smart-meter-device-id",
     "LOCAL_KEY": "local-key",
     "IP_ADDRESS": "10.0.0.20",
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json
index ec751e3628..5033faa4b5 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json
@@ -6,6 +6,7 @@
     { "name": "LOCAL_KEY", "value": "local-key" },
     { "name": "IP_ADDRESS", "value": "10.0.0.20" },
     { "name": "CLOUD_IP", "value": "82.0.0.10" },
+    { "name": "CLOUD_READ_STRATEGY", "value": "shadow" },
     { "name": "LOCAL_OVERRIDE", "value": true },
     { "name": "PROTOCOL_VERSION", "value": "3.3" },
     { "name": "PRODUCT_ID", "value": "bbcg1hrkrj5rifsd" }
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json
index 0097001b67..8a78973348 100644
--- a/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json
@@ -10,6 +10,7 @@
   "poll_frequency": 10000,
   "should_poll": true,
   "params": {
+    "CLOUD_READ_STRATEGY": "legacy",
     "DEVICE_ID": "socket-device-id",
     "LOCAL_KEY": "local-key",
     "IP_ADDRESS": "10.0.0.10",
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
index f47808a598..cce2cca00f 100644
--- a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
@@ -60,6 +60,7 @@ describe('tuya.convertDevice', () => {
     expect(params[DEVICE_PARAM_NAME.LOCAL_OVERRIDE]).to.equal(true);
     expect(params[DEVICE_PARAM_NAME.PRODUCT_ID]).to.equal('product-id');
     expect(params[DEVICE_PARAM_NAME.PRODUCT_KEY]).to.equal('product-key');
+    expect(params[DEVICE_PARAM_NAME.CLOUD_READ_STRATEGY]).to.equal('legacy');
   });
 
   it('should handle missing optional fields', () => {
@@ -121,6 +122,11 @@ describe('tuya.convertDevice', () => {
     ]);
     expect(device.features.find((feature) => feature.external_id === 'tuya:device-id:cur_power').scale).to.equal(1);
     expect(device.poll_frequency).to.equal(DEVICE_POLL_FREQUENCIES.EVERY_10_SECONDS);
+    const params = device.params.reduce((acc, param) => {
+      acc[param.name] = param.value;
+      return acc;
+    }, {});
+    expect(params[DEVICE_PARAM_NAME.CLOUD_READ_STRATEGY]).to.equal('shadow');
   });
 
   it('should keep specification group when thing model exposes the same code', () => {
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index 023304cb04..4dd6232087 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -193,6 +193,10 @@ describe('TuyaHandler.discoverDevices', () => {
           name: 'LOCAL_OVERRIDE',
           value: false,
         },
+        {
+          name: 'CLOUD_READ_STRATEGY',
+          value: 'legacy',
+        },
       ],
       properties: {
         properties: [{ code: 'switch_1', value: true }],
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index e87af3e0b4..1c2da12812 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -171,6 +171,38 @@ describe('TuyaHandler.poll', () => {
     });
   });
 
+  it('should read cloud values from thing shadow when strategy is shadow', async () => {
+    tuyaHandler.connector.request = sinon.stub().resolves({
+      result: {
+        properties: [{ code: 'power_a', value: 706 }],
+      },
+    });
+
+    await tuyaHandler.poll({
+      external_id: 'tuya:device',
+      params: [{ name: 'CLOUD_READ_STRATEGY', value: 'shadow' }],
+      features: [
+        {
+          external_id: 'tuya:device:power_a',
+          category: 'energy-sensor',
+          type: 'power',
+          scale: 1,
+        },
+      ],
+    });
+
+    assert.callCount(tuyaHandler.connector.request, 1);
+    assert.calledWith(tuyaHandler.connector.request, {
+      method: 'GET',
+      path: `${API.VERSION_2_0}/thing/device/shadow/properties`,
+    });
+    assert.callCount(gladys.event.emit, 1);
+    assert.calledWith(gladys.event.emit, EVENTS.DEVICE.NEW_STATE, {
+      device_feature_external_id: 'tuya:device:power_a',
+      state: 70.6,
+    });
+  });
+
   it('should return without cloud request when feature list is empty', async () => {
     await tuyaHandler.poll({
       external_id: 'tuya:device',

From 2b359f11140691b47438eb51a50ad725bc27506f Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Tue, 3 Mar 2026 08:09:43 +0100
Subject: [PATCH 84/90] feat(tuya): add support for pilot thermostat devices

---
 .../PilotWireModeDeviceFeature.jsx            |   6 +
 .../sensor-value/PilotWireModeDeviceValue.jsx |  14 +
 .../sensor-value/SensorDeviceFeature.jsx      |   4 +-
 front/src/config/i18n/de.json                 |   8 +-
 front/src/config/i18n/en.json                 |   8 +-
 front/src/config/i18n/fr.json                 |   8 +-
 ...080000-rename-tuya-cloud-strategy-param.js |  60 +++++
 .../tuya/lib/device/tuya.convertDevice.js     |  43 +--
 .../tuya/lib/device/tuya.convertFeature.js    |  22 +-
 .../tuya/lib/device/tuya.deviceMapping.js     |  72 +++++-
 .../lib/mappings/cloud/pilot-thermostat.js    |  77 ++++++
 server/services/tuya/lib/mappings/index.js    |  23 +-
 .../lib/mappings/local/pilot-thermostat.js    |  40 +++
 server/services/tuya/lib/tuya.poll.js         | 229 +++++++++++++---
 server/services/tuya/lib/tuya.setValue.js     | 140 ++++++++--
 .../tuya/lib/utils/tuya.cloudStrategy.js      |  20 +-
 .../services/tuya/lib/utils/tuya.constants.js |   2 +-
 .../services/tuya/lib/utils/tuya.normalize.js |  31 +++
 .../cloud-status.json                         |  42 +++
 .../expected-device.json                      | 173 +++++++++++++
 .../expected-events.json                      |  34 +++
 .../expected-local-mapping.json               |  10 +
 .../input-device.json                         | 154 +++++++++++
 .../local-dps.json                            |  22 ++
 .../manifest.js                               |  32 +++
 .../poll-device.json                          | 174 +++++++++++++
 .../expected-device.json                      |   2 +-
 .../poll-device.json                          |   2 +-
 .../expected-device.json                      |   5 +-
 .../smart-socket-basic/expected-device.json   |   4 +-
 .../feature/tuya.convertFeature.test.js       |   6 +-
 .../device/feature/tuya.deviceMapping.test.js |  75 +++++-
 .../lib/device/tuya.convertDevice.test.js     |   4 +-
 .../tuya/lib/device/tuya.localMapping.test.js |  13 +
 .../tuya/lib/tuya.discoverDevices.test.js     |   4 +-
 .../test/services/tuya/lib/tuya.poll.test.js  | 244 +++++++++++++++++-
 .../services/tuya/lib/tuya.setValue.test.js   | 202 ++++++++++++++-
 server/utils/constants.js                     |   2 +
 38 files changed, 1901 insertions(+), 110 deletions(-)
 create mode 100644 front/src/components/boxs/device-in-room/device-features/sensor-value/PilotWireModeDeviceValue.jsx
 create mode 100644 server/migrations/20260303080000-rename-tuya-cloud-strategy-param.js
 create mode 100644 server/services/tuya/lib/mappings/cloud/pilot-thermostat.js
 create mode 100644 server/services/tuya/lib/mappings/local/pilot-thermostat.js
 create mode 100644 server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/cloud-status.json
 create mode 100644 server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/expected-device.json
 create mode 100644 server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/expected-events.json
 create mode 100644 server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/expected-local-mapping.json
 create mode 100644 server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/input-device.json
 create mode 100644 server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/local-dps.json
 create mode 100644 server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/manifest.js
 create mode 100644 server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/poll-device.json

diff --git a/front/src/components/boxs/device-in-room/device-features/PilotWireModeDeviceFeature.jsx b/front/src/components/boxs/device-in-room/device-features/PilotWireModeDeviceFeature.jsx
index 71bdb51f71..eb6096ac9b 100644
--- a/front/src/components/boxs/device-in-room/device-features/PilotWireModeDeviceFeature.jsx
+++ b/front/src/components/boxs/device-in-room/device-features/PilotWireModeDeviceFeature.jsx
@@ -41,6 +41,12 @@ const PilotWireModeDeviceFeature = ({ children, ...props }) => {
               <option value={PILOT_WIRE_MODE.COMFORT}>
                 <Text id={`deviceFeatureAction.category.${category}.${type}.comfort`} />
               </option>
+              <option value={PILOT_WIRE_MODE.PROGRAMMING}>
+                <Text id={`deviceFeatureAction.category.${category}.${type}.programming`} />
+              </option>
+              <option value={PILOT_WIRE_MODE.THERMOSTAT}>
+                <Text id={`deviceFeatureAction.category.${category}.${type}.thermostat`} />
+              </option>
             </select>
           </div>
         </div>
diff --git a/front/src/components/boxs/device-in-room/device-features/sensor-value/PilotWireModeDeviceValue.jsx b/front/src/components/boxs/device-in-room/device-features/sensor-value/PilotWireModeDeviceValue.jsx
new file mode 100644
index 0000000000..35af8b3e9c
--- /dev/null
+++ b/front/src/components/boxs/device-in-room/device-features/sensor-value/PilotWireModeDeviceValue.jsx
@@ -0,0 +1,14 @@
+import { Text } from 'preact-i18n';
+
+const PilotWireModeDeviceValue = ({ deviceFeature }) => (
+  <div>
+    {deviceFeature.last_value === null && <Text id="dashboard.boxes.devicesInRoom.noValue" />}
+    {deviceFeature.last_value !== null && (
+      <Text
+        id={`deviceFeatureValue.category.${deviceFeature.category}.${deviceFeature.type}.${deviceFeature.last_value}`}
+      />
+    )}
+  </div>
+);
+
+export default PilotWireModeDeviceValue;
diff --git a/front/src/components/boxs/device-in-room/device-features/sensor-value/SensorDeviceFeature.jsx b/front/src/components/boxs/device-in-room/device-features/sensor-value/SensorDeviceFeature.jsx
index ddc9e20eb5..d3748d5f05 100644
--- a/front/src/components/boxs/device-in-room/device-features/sensor-value/SensorDeviceFeature.jsx
+++ b/front/src/components/boxs/device-in-room/device-features/sensor-value/SensorDeviceFeature.jsx
@@ -18,6 +18,7 @@ import NoRecentValueBadge from './NoRecentValueBadge';
 import TemperatureSensorDeviceValue from './TemperatureSensorDeviceValue';
 import LevelSensorDeviceValue from './LevelSensorDeviceValue';
 import PressureSensorDeviceValue from './PressureSensorDeviceValue';
+import PilotWireModeDeviceValue from './PilotWireModeDeviceValue';
 
 const DISPLAY_BY_FEATURE_CATEGORY = {
   [DEVICE_FEATURE_CATEGORIES.MOTION_SENSOR]: MotionSensorDeviceValue,
@@ -50,7 +51,8 @@ const DISPLAY_BY_FEATURE_TYPE = {
   [DEVICE_FEATURE_TYPES.ELECTRICAL_VEHICLE_CLIMATE.INDOOR_TEMPERATURE]: TemperatureSensorDeviceValue,
   [DEVICE_FEATURE_TYPES.ELECTRICAL_VEHICLE_BATTERY.BATTERY_RANGE_ESTIMATE]: DistanceSensorDeviceValue,
   [DEVICE_FEATURE_TYPES.ELECTRICAL_VEHICLE_STATE.ODOMETER]: DistanceSensorDeviceValue,
-  [DEVICE_FEATURE_TYPES.ELECTRICAL_VEHICLE_STATE.TIRE_PRESSURE]: PressureSensorDeviceValue
+  [DEVICE_FEATURE_TYPES.ELECTRICAL_VEHICLE_STATE.TIRE_PRESSURE]: PressureSensorDeviceValue,
+  [DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE]: PilotWireModeDeviceValue
 };
 
 const DEVICE_FEATURES_WITHOUT_EXPIRATION = [
diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json
index 7555b3ec93..8c48ffee6c 100644
--- a/front/src/config/i18n/de.json
+++ b/front/src/config/i18n/de.json
@@ -3395,7 +3395,9 @@
           "off": "Aus",
           "frost-protection": "Frostschutz",
           "comfort_-1": "Komfort -1°C",
-          "comfort_-2": "Komfort -2°C"
+          "comfort_-2": "Komfort -2°C",
+          "programming": "Programm",
+          "thermostat": "Thermostat"
         }
       },
       "siren": {
@@ -3512,7 +3514,9 @@
           "2": "Öko",
           "3": "Komfort -1°C",
           "4": "Komfort -2°C",
-          "5": "Komfort"
+          "5": "Komfort",
+          "6": "Programm",
+          "7": "Thermostat"
         }
       },
       "opening-sensor": {
diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json
index 1d92b80a45..0e23648d2c 100644
--- a/front/src/config/i18n/en.json
+++ b/front/src/config/i18n/en.json
@@ -3395,7 +3395,9 @@
           "off": "Off",
           "frost-protection": "Frost Protection",
           "comfort_-1": "Comfort -1°C",
-          "comfort_-2": "Comfort -2°C"
+          "comfort_-2": "Comfort -2°C",
+          "programming": "Programming",
+          "thermostat": "Thermostat"
         }
       },
       "siren": {
@@ -3512,7 +3514,9 @@
           "2": "Eco",
           "3": "Comfort -1°C",
           "4": "Comfort -2°C",
-          "5": "Comfort"
+          "5": "Comfort",
+          "6": "Programming",
+          "7": "Thermostat"
         }
       },
       "opening-sensor": {
diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json
index c86ed92caf..7a412225e3 100644
--- a/front/src/config/i18n/fr.json
+++ b/front/src/config/i18n/fr.json
@@ -3395,7 +3395,9 @@
           "off": "Off",
           "frost-protection": "Hors Gel",
           "comfort_-1": "Confort -1°C",
-          "comfort_-2": "Confort -2°C"
+          "comfort_-2": "Confort -2°C",
+          "programming": "Programmation",
+          "thermostat": "Thermostat"
         }
       },
       "siren": {
@@ -3512,7 +3514,9 @@
           "2": "Eco",
           "3": "Confort -1°C",
           "4": "Confort -2°C",
-          "5": "Confort"
+          "5": "Confort",
+          "6": "Programmation",
+          "7": "Thermostat"
         }
       },
       "opening-sensor": {
diff --git a/server/migrations/20260303080000-rename-tuya-cloud-strategy-param.js b/server/migrations/20260303080000-rename-tuya-cloud-strategy-param.js
new file mode 100644
index 0000000000..669c382851
--- /dev/null
+++ b/server/migrations/20260303080000-rename-tuya-cloud-strategy-param.js
@@ -0,0 +1,60 @@
+const Promise = require('bluebird');
+
+const db = require('../models');
+const logger = require('../utils/logger');
+
+const OLD_PARAM_NAME = 'CLOUD_READ_STRATEGY';
+const NEW_PARAM_NAME = 'CLOUD_STRATEGY';
+
+module.exports = {
+  up: async () => {
+    const service = await db.Service.findOne({
+      where: {
+        name: 'tuya',
+      },
+    });
+    if (service === null) {
+      return;
+    }
+
+    logger.info(`Tuya migration: Found service tuya = ${service.id}`);
+    const tuyaDevices = await db.Device.findAll({
+      where: {
+        service_id: service.id,
+      },
+    });
+    logger.info(`Tuya migration: Found ${tuyaDevices.length} devices`);
+
+    await Promise.each(tuyaDevices, async (device) => {
+      const oldParam = await db.DeviceParam.findOne({
+        where: {
+          device_id: device.id,
+          name: OLD_PARAM_NAME,
+        },
+      });
+      if (oldParam === null) {
+        return;
+      }
+
+      const existingNewParam = await db.DeviceParam.findOne({
+        where: {
+          device_id: device.id,
+          name: NEW_PARAM_NAME,
+        },
+      });
+
+      if (existingNewParam === null) {
+        logger.info(`Tuya migration: Creating ${NEW_PARAM_NAME} for device ${device.id}`);
+        await db.DeviceParam.create({
+          device_id: device.id,
+          name: NEW_PARAM_NAME,
+          value: oldParam.value,
+        });
+      }
+
+      logger.info(`Tuya migration: Removing ${OLD_PARAM_NAME} for device ${device.id}`);
+      await oldParam.destroy();
+    });
+  },
+  down: async () => {},
+};
diff --git a/server/services/tuya/lib/device/tuya.convertDevice.js b/server/services/tuya/lib/device/tuya.convertDevice.js
index 14c417fb57..0ec551eb5a 100644
--- a/server/services/tuya/lib/device/tuya.convertDevice.js
+++ b/server/services/tuya/lib/device/tuya.convertDevice.js
@@ -1,12 +1,20 @@
 const { DEVICE_POLL_FREQUENCIES } = require('../../../../utils/constants');
 const { DEVICE_PARAM_NAME } = require('../utils/tuya.constants');
-const { normalizeBoolean } = require('../utils/tuya.normalize');
-const { resolveCloudReadStrategy } = require('../utils/tuya.cloudStrategy');
+const { normalizeBoolean, normalizeTemperatureUnit } = require('../utils/tuya.normalize');
+const { resolveCloudStrategy } = require('../utils/tuya.cloudStrategy');
 const { mergeTuyaReport } = require('../utils/tuya.report');
 const { convertFeature } = require('./tuya.convertFeature');
 const { getDeviceType, getIgnoredCloudCodes, getIgnoredLocalDps } = require('../mappings');
 const logger = require('../../../../utils/logger');
 
+const getTemperatureUnit = (properties) => {
+  const currentProperties = Array.isArray(properties && properties.properties) ? properties.properties : [];
+  const unitProperty = currentProperties.find(
+    (property) => property && (property.code === 'temp_unit_convert' || property.code === 'unit'),
+  );
+  return normalizeTemperatureUnit(unitProperty && unitProperty.value);
+};
+
 /**
  * @description Transform Tuya device to Gladys device.
  * @param {object} tuyaDevice - Tuya device.
@@ -37,6 +45,19 @@ function convertDevice(tuyaDevice) {
   const { functions = [], status = [] } = specifications;
   const online = tuyaDevice.online !== undefined ? tuyaDevice.online : tuyaDevice.is_online;
   const normalizedLocalOverride = normalizeBoolean(localOverride);
+  const temperatureUnit = getTemperatureUnit(properties);
+
+  const safeDeviceLog = {
+    id,
+    name,
+    model: productName || model,
+    product_id: productId,
+    protocol_version: protocolVersion,
+    local_override: normalizedLocalOverride,
+    online,
+  };
+  logger.debug('Tuya convert device specifications');
+  logger.debug(JSON.stringify(safeDeviceLog));
 
   logger.debug(`Tuya convert device "${name}, ${productName || model}"`);
   const deviceType = getDeviceType({
@@ -49,7 +70,7 @@ function convertDevice(tuyaDevice) {
     properties,
     thing_model: thingModel,
   });
-  const cloudReadStrategy = resolveCloudReadStrategy(tuyaDevice, deviceType);
+  const cloudStrategy = resolveCloudStrategy(tuyaDevice, deviceType);
 
   const params = [];
   if (id) {
@@ -76,20 +97,9 @@ function convertDevice(tuyaDevice) {
   if (productKey) {
     params.push({ name: DEVICE_PARAM_NAME.PRODUCT_KEY, value: productKey });
   }
-  if (cloudReadStrategy) {
-    params.push({ name: DEVICE_PARAM_NAME.CLOUD_READ_STRATEGY, value: cloudReadStrategy });
+  if (cloudStrategy) {
+    params.push({ name: DEVICE_PARAM_NAME.CLOUD_STRATEGY, value: cloudStrategy });
   }
-  const safeDeviceLog = {
-    id,
-    name,
-    model: productName || model,
-    product_id: productId,
-    protocol_version: protocolVersion,
-    local_override: normalizedLocalOverride,
-    online,
-  };
-  logger.debug('Tuya convert device specifications');
-  logger.debug(JSON.stringify(safeDeviceLog));
 
   // Groups cloud specification entries first, then thing model properties, then current property shadow codes.
   const groups = {};
@@ -137,6 +147,7 @@ function convertDevice(tuyaDevice) {
     convertFeature(group, externalId, {
       deviceType,
       ignoredCloudCodes,
+      temperatureUnit,
     }),
   );
 
diff --git a/server/services/tuya/lib/device/tuya.convertFeature.js b/server/services/tuya/lib/device/tuya.convertFeature.js
index 769258ea13..1cec8b8a1f 100644
--- a/server/services/tuya/lib/device/tuya.convertFeature.js
+++ b/server/services/tuya/lib/device/tuya.convertFeature.js
@@ -1,4 +1,5 @@
 const logger = require('../../../../utils/logger');
+const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../../utils/constants');
 const { getFeatureMapping, getIgnoredCloudCodes, normalizeCode } = require('../mappings');
 
 /**
@@ -12,7 +13,7 @@ const { getFeatureMapping, getIgnoredCloudCodes, normalizeCode } = require('../m
  */
 function convertFeature(tuyaFunctions, externalId, options = {}) {
   const { code, values, name, readOnly } = tuyaFunctions;
-  const { deviceType, ignoredCloudCodes } = options;
+  const { deviceType, ignoredCloudCodes, temperatureUnit } = options;
 
   const codeLower = normalizeCode(code);
   const ignoredCodes = Array.isArray(ignoredCloudCodes) ? ignoredCloudCodes : getIgnoredCloudCodes(deviceType);
@@ -58,6 +59,25 @@ function convertFeature(tuyaFunctions, externalId, options = {}) {
   if ('scale' in valuesObject) {
     feature.scale = valuesObject.scale;
   }
+  if (temperatureUnit && (codeLower === 'temp_set' || codeLower === 'temp_current') && feature.unit !== undefined) {
+    feature.unit = temperatureUnit;
+  }
+  if (
+    feature.scale !== undefined &&
+    feature.category === DEVICE_FEATURE_CATEGORIES.THERMOSTAT &&
+    feature.type === DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE
+  ) {
+    const divider = 10 ** feature.scale;
+    if (typeof feature.min === 'number') {
+      feature.min /= divider;
+    }
+    if (typeof feature.max === 'number') {
+      feature.max /= divider;
+    }
+  }
+  if (feature.read_only === false) {
+    feature.has_feedback = true;
+  }
 
   return feature;
 }
diff --git a/server/services/tuya/lib/device/tuya.deviceMapping.js b/server/services/tuya/lib/device/tuya.deviceMapping.js
index 535dd7be07..d7eb59312b 100644
--- a/server/services/tuya/lib/device/tuya.deviceMapping.js
+++ b/server/services/tuya/lib/device/tuya.deviceMapping.js
@@ -1,4 +1,10 @@
-const { DEVICE_FEATURE_TYPES, DEVICE_FEATURE_CATEGORIES, COVER_STATE } = require('../../../../utils/constants');
+const {
+  DEVICE_FEATURE_TYPES,
+  DEVICE_FEATURE_CATEGORIES,
+  COVER_STATE,
+  OPENING_SENSOR_STATE,
+  PILOT_WIRE_MODE,
+} = require('../../../../utils/constants');
 
 const { intToRgb, rgbToHsb, rgbToInt, hsbToRgb } = require('../../../../utils/colors');
 const { normalizeBoolean } = require('../utils/tuya.normalize');
@@ -7,6 +13,25 @@ const OPEN = 'open';
 const CLOSE = 'close';
 const STOP = 'stop';
 
+const TUYA_PILOT_WIRE_MODE_TO_GLADYS = {
+  Standby: PILOT_WIRE_MODE.OFF,
+  Anti_forst: PILOT_WIRE_MODE.FROST_PROTECTION,
+  ECO: PILOT_WIRE_MODE.ECO,
+  Comfort_1: PILOT_WIRE_MODE.COMFORT_1,
+  Comfort_2: PILOT_WIRE_MODE.COMFORT_2,
+  Comfort: PILOT_WIRE_MODE.COMFORT,
+  Programming: PILOT_WIRE_MODE.PROGRAMMING,
+  Thermostat: PILOT_WIRE_MODE.THERMOSTAT,
+};
+
+const GLADYS_PILOT_WIRE_MODE_TO_TUYA = Object.entries(TUYA_PILOT_WIRE_MODE_TO_GLADYS).reduce(
+  (accumulator, [tuyaValue, gladysValue]) => {
+    accumulator[gladysValue] = tuyaValue;
+    return accumulator;
+  },
+  {},
+);
+
 const getScale = (deviceFeature, defaultScale = 0) => {
   const parsedScale =
     deviceFeature && deviceFeature.scale !== undefined && deviceFeature.scale !== null
@@ -25,6 +50,15 @@ const scaleValue = (valueFromDevice, deviceFeature, defaultScale = 0) => {
   return parsedValue / 10 ** scale;
 };
 
+const unscaleValue = (valueFromGladys, deviceFeature, defaultScale = 0) => {
+  const parsedValue = Number(valueFromGladys);
+  if (Number.isNaN(parsedValue)) {
+    return parsedValue;
+  }
+  const scale = getScale(deviceFeature, defaultScale);
+  return Math.round(parsedValue * 10 ** scale);
+};
+
 const writeValues = {
   [DEVICE_FEATURE_CATEGORIES.LIGHT]: {
     [DEVICE_FEATURE_TYPES.LIGHT.BINARY]: (valueFromGladys) => {
@@ -58,6 +92,17 @@ const writeValues = {
       return valueFromGladys === 1;
     },
   },
+  [DEVICE_FEATURE_CATEGORIES.THERMOSTAT]: {
+    [DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE]: (valueFromGladys, deviceFeature) => {
+      return unscaleValue(valueFromGladys, deviceFeature, 0);
+    },
+  },
+  [DEVICE_FEATURE_CATEGORIES.HEATER]: {
+    [DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE]: (valueFromGladys) => {
+      const parsedValue = parseInt(valueFromGladys, 10);
+      return GLADYS_PILOT_WIRE_MODE_TO_TUYA[parsedValue];
+    },
+  },
 
   [DEVICE_FEATURE_CATEGORIES.CURTAIN]: {
     [DEVICE_FEATURE_TYPES.CURTAIN.STATE]: (valueFromGladys) => {
@@ -116,6 +161,16 @@ const readValues = {
       return normalizeBoolean(valueFromDevice) ? 1 : 0;
     },
   },
+  [DEVICE_FEATURE_CATEGORIES.THERMOSTAT]: {
+    [DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE]: (valueFromDevice, deviceFeature) => {
+      return scaleValue(valueFromDevice, deviceFeature, 0);
+    },
+  },
+  [DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR]: {
+    [DEVICE_FEATURE_TYPES.SENSOR.DECIMAL]: (valueFromDevice, deviceFeature) => {
+      return scaleValue(valueFromDevice, deviceFeature, 0);
+    },
+  },
   [DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR]: {
     [DEVICE_FEATURE_TYPES.ENERGY_SENSOR.POWER]: (valueFromDevice, deviceFeature) => {
       return scaleValue(valueFromDevice, deviceFeature, 0);
@@ -123,6 +178,9 @@ const readValues = {
     [DEVICE_FEATURE_TYPES.ENERGY_SENSOR.ENERGY]: (valueFromDevice, deviceFeature) => {
       return scaleValue(valueFromDevice, deviceFeature, 0);
     },
+    [DEVICE_FEATURE_TYPES.ENERGY_SENSOR.INDEX_TODAY]: (valueFromDevice, deviceFeature) => {
+      return scaleValue(valueFromDevice, deviceFeature, 0);
+    },
     [DEVICE_FEATURE_TYPES.ENERGY_SENSOR.VOLTAGE]: (valueFromDevice, deviceFeature) => {
       return scaleValue(valueFromDevice, deviceFeature, 0);
     },
@@ -135,6 +193,18 @@ const readValues = {
       return scaleValue(valueFromDevice, deviceFeature, 0);
     },
   },
+  [DEVICE_FEATURE_CATEGORIES.OPENING_SENSOR]: {
+    [DEVICE_FEATURE_TYPES.SENSOR.BINARY]: (valueFromDevice) => {
+      return normalizeBoolean(valueFromDevice) ? OPENING_SENSOR_STATE.OPEN : OPENING_SENSOR_STATE.CLOSE;
+    },
+  },
+  [DEVICE_FEATURE_CATEGORIES.HEATER]: {
+    [DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE]: (valueFromDevice) => {
+      return Object.prototype.hasOwnProperty.call(TUYA_PILOT_WIRE_MODE_TO_GLADYS, valueFromDevice)
+        ? TUYA_PILOT_WIRE_MODE_TO_GLADYS[valueFromDevice]
+        : null;
+    },
+  },
   [DEVICE_FEATURE_CATEGORIES.CURTAIN]: {
     [DEVICE_FEATURE_TYPES.CURTAIN.STATE]: (valueFromDevice) => {
       if (valueFromDevice === OPEN) {
diff --git a/server/services/tuya/lib/mappings/cloud/pilot-thermostat.js b/server/services/tuya/lib/mappings/cloud/pilot-thermostat.js
new file mode 100644
index 0000000000..62b45a9ae3
--- /dev/null
+++ b/server/services/tuya/lib/mappings/cloud/pilot-thermostat.js
@@ -0,0 +1,77 @@
+const {
+  DEVICE_FEATURE_TYPES,
+  DEVICE_FEATURE_CATEGORIES,
+  DEVICE_FEATURE_UNITS,
+} = require('../../../../../utils/constants');
+
+module.exports = {
+  ignoredCodes: [
+    'week_program_1',
+    'week_program_2',
+    'week_program_3',
+    'week_program_4',
+    'week_program_5',
+    'week_program_6',
+    'week_program_7',
+    'vacation_duration',
+    'boost_duration',
+    'elec_statistics_day',
+    'elec_statistics_month',
+    'elec_statistics_year',
+    'temp_correction',
+    'air_pressure_index',
+    'support_features',
+    'window_check',
+    'window_keep_time',
+    'temp_unit_convert',
+    'app_features',
+    'switch_diff',
+    'upper_temp',
+    'lower_temp',
+    'night_led_config',
+    'ecowatt_url',
+  ],
+  mode: {
+    category: DEVICE_FEATURE_CATEGORIES.HEATER,
+    type: DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE,
+    has_feedback: true,
+  },
+  running_mode: {
+    category: DEVICE_FEATURE_CATEGORIES.HEATER,
+    type: DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE,
+  },
+  child_lock: {
+    category: DEVICE_FEATURE_CATEGORIES.CHILD_LOCK,
+    type: DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY,
+    has_feedback: true,
+  },
+  electricity_statistics: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.INDEX_TODAY,
+    unit: DEVICE_FEATURE_UNITS.KILOWATT_HOUR,
+    scale: 1,
+  },
+  temp_current: {
+    category: DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR,
+    type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
+    unit: DEVICE_FEATURE_UNITS.CELSIUS,
+    scale: 1,
+  },
+  average_power: {
+    category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
+    type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.POWER,
+    unit: DEVICE_FEATURE_UNITS.WATT,
+    scale: 1,
+  },
+  window_state: {
+    category: DEVICE_FEATURE_CATEGORIES.OPENING_SENSOR,
+    type: DEVICE_FEATURE_TYPES.SENSOR.BINARY,
+  },
+  temp_set: {
+    category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
+    type: DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
+    unit: DEVICE_FEATURE_UNITS.CELSIUS,
+    scale: 1,
+    has_feedback: true,
+  },
+};
diff --git a/server/services/tuya/lib/mappings/index.js b/server/services/tuya/lib/mappings/index.js
index 47243fe183..2c7cd78aaf 100644
--- a/server/services/tuya/lib/mappings/index.js
+++ b/server/services/tuya/lib/mappings/index.js
@@ -1,20 +1,41 @@
 const globalCloud = require('./cloud/global');
+const pilotThermostatCloud = require('./cloud/pilot-thermostat');
 const smartMeterCloud = require('./cloud/smart-meter');
 const smartSocketCloud = require('./cloud/smart-socket');
 
 const globalLocal = require('./local/global');
+const pilotThermostatLocal = require('./local/pilot-thermostat');
 const smartMeterLocal = require('./local/smart-meter');
 const smartSocketLocal = require('./local/smart-socket');
 
 const DEVICE_TYPES = {
+  PILOT_THERMOSTAT: 'pilot-thermostat',
   SMART_METER: 'smart-meter',
   SMART_SOCKET: 'smart-socket',
   UNKNOWN: 'unknown',
 };
 
+const PILOT_THERMOSTAT_CODES = new Set([
+  'mode',
+  'running_mode',
+  'child_lock',
+  'temp_set',
+  'temp_current',
+  'window_state',
+]);
 const SWITCH_CODES = new Set(['switch', 'switch_1', 'switch_2', 'power']);
 const SMART_METER_CODES = new Set(['total_power', 'forward_energy_total', 'voltage_a', 'current_a']);
 
+const PILOT_THERMOSTAT = {
+  DEVICE_TYPE_NAME: DEVICE_TYPES.PILOT_THERMOSTAT,
+  CATEGORIES: new Set(),
+  PRODUCT_IDS: new Set(['c03zek9b5daz7omr']),
+  KEYWORDS: ['thermostat', 'pilote', 'pilot'],
+  REQUIRED_CODES: PILOT_THERMOSTAT_CODES,
+  CLOUD_MAPPINGS: pilotThermostatCloud,
+  LOCAL_MAPPINGS: pilotThermostatLocal,
+};
+
 const SMART_SOCKET = {
   DEVICE_TYPE_NAME: DEVICE_TYPES.SMART_SOCKET,
   CATEGORIES: new Set(['cz']),
@@ -35,7 +56,7 @@ const SMART_METER = {
   LOCAL_MAPPINGS: smartMeterLocal,
 };
 
-const LIST_DEVICE_TYPES = [SMART_SOCKET, SMART_METER];
+const LIST_DEVICE_TYPES = [PILOT_THERMOSTAT, SMART_SOCKET, SMART_METER];
 
 const normalizeCode = (code) => {
   if (!code) {
diff --git a/server/services/tuya/lib/mappings/local/pilot-thermostat.js b/server/services/tuya/lib/mappings/local/pilot-thermostat.js
new file mode 100644
index 0000000000..0a34d34267
--- /dev/null
+++ b/server/services/tuya/lib/mappings/local/pilot-thermostat.js
@@ -0,0 +1,40 @@
+module.exports = {
+  strict: true,
+  ignoredDps: [
+    '103',
+    '104',
+    '105',
+    '106',
+    '107',
+    '108',
+    '109',
+    '110',
+    '111',
+    '113',
+    '114',
+    '115',
+    '118',
+    '120',
+    '121',
+    '122',
+    '124',
+    '126',
+    '127',
+    '128',
+    '129',
+    '130',
+    '132',
+    '133',
+  ],
+  codeAliases: {},
+  dps: {
+    mode: 101,
+    child_lock: 102,
+    electricity_statistics: 112,
+    temp_current: 116,
+    average_power: 117,
+    window_state: 123,
+    temp_set: 125,
+    running_mode: 131,
+  },
+};
diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index 4a75345d38..fd126a5479 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -2,12 +2,14 @@ const { BadParameters } = require('../../../utils/coreErrors');
 const logger = require('../../../utils/logger');
 const { readValues } = require('./device/tuya.deviceMapping');
 const { API, DEVICE_PARAM_NAME } = require('./utils/tuya.constants');
-const { EVENTS } = require('../../../utils/constants');
-const { CLOUD_STRATEGY, getConfiguredCloudReadStrategy } = require('./utils/tuya.cloudStrategy');
-const { normalizeBoolean } = require('./utils/tuya.normalize');
+const { EVENTS, DEVICE_FEATURE_UNITS } = require('../../../utils/constants');
+const { celsiusToFahrenheit, fahrenheitToCelsius } = require('../../../utils/units');
+const { normalizeBoolean, normalizeTemperatureUnit } = require('./utils/tuya.normalize');
+const { CLOUD_STRATEGY, getConfiguredCloudStrategy } = require('./utils/tuya.cloudStrategy');
 const { getParamValue } = require('./utils/tuya.deviceParams');
 const { localPoll } = require('./tuya.localPoll');
 const { getLocalDpsFromCode } = require('./device/tuya.localMapping');
+const { getDeviceType, getFeatureMapping } = require('./mappings');
 
 const SAME_VALUE_EMIT_INTERVAL_MS = 3 * 60 * 1000;
 
@@ -33,6 +35,45 @@ const getFeatureReader = (deviceFeature) => {
   return categoryReaders[deviceFeature.type] || null;
 };
 
+const getTemperatureUnitFromProperties = (device) => {
+  if (!device || !device.properties || !Array.isArray(device.properties.properties)) {
+    return null;
+  }
+  const unitProperty = device.properties.properties.find(
+    (property) => property.code === 'temp_unit_convert' || property.code === 'unit',
+  );
+  return normalizeTemperatureUnit(unitProperty && unitProperty.value);
+};
+
+const updatePropertyValue = (device, code, value) => {
+  if (!device || !device.properties || !Array.isArray(device.properties.properties) || !code) {
+    return;
+  }
+  const propertyIndex = device.properties.properties.findIndex((property) => property && property.code === code);
+  if (propertyIndex === -1) {
+    return;
+  }
+  device.properties.properties[propertyIndex] = {
+    ...device.properties.properties[propertyIndex],
+    value,
+  };
+};
+
+const getFeatureWithFallbackScale = (device, deviceFeature, code) => {
+  if (!deviceFeature || deviceFeature.scale !== undefined) {
+    return deviceFeature;
+  }
+  const deviceType = device && device.device_type ? device.device_type : getDeviceType(device);
+  const mapping = getFeatureMapping(code, deviceType);
+  if (!mapping || mapping.scale === undefined) {
+    return deviceFeature;
+  }
+  return {
+    ...deviceFeature,
+    scale: mapping.scale,
+  };
+};
+
 const hasDpsKey = (dps, key) => {
   const stringKey = String(key);
   return Object.prototype.hasOwnProperty.call(dps, stringKey) || Object.prototype.hasOwnProperty.call(dps, key);
@@ -97,7 +138,84 @@ const emitFeatureState = (gladys, deviceFeature, transformedValue, previousValue
   return { emitted, changed };
 };
 
-const extractValuesFromResultArray = (result) => {
+const isTemperatureFeature = (deviceFeature, code) => {
+  if (!deviceFeature || !code) {
+    return false;
+  }
+  if (deviceFeature.unit !== DEVICE_FEATURE_UNITS.CELSIUS && deviceFeature.unit !== DEVICE_FEATURE_UNITS.FAHRENHEIT) {
+    return false;
+  }
+  return code === 'temp_set' || code === 'temp_current';
+};
+
+const roundTemperatureValue = (value, code) => {
+  if (!Number.isFinite(value)) {
+    return value;
+  }
+  if (code === 'temp_set') {
+    return Math.round(value);
+  }
+  if (code === 'temp_current') {
+    return Math.round(value * 10) / 10;
+  }
+  return value;
+};
+
+const convertTemperatureValue = (value, fromUnit, toUnit, deviceFeature, code) => {
+  if (value === null || value === undefined) {
+    return value;
+  }
+  const numericValue = Number(value);
+  if (!Number.isFinite(numericValue) || !fromUnit || !toUnit || fromUnit === toUnit) {
+    return value;
+  }
+  let convertedValue = numericValue;
+  if (fromUnit === DEVICE_FEATURE_UNITS.CELSIUS && toUnit === DEVICE_FEATURE_UNITS.FAHRENHEIT) {
+    convertedValue = celsiusToFahrenheit(numericValue);
+  }
+  if (fromUnit === DEVICE_FEATURE_UNITS.FAHRENHEIT && toUnit === DEVICE_FEATURE_UNITS.CELSIUS) {
+    convertedValue = fahrenheitToCelsius(numericValue);
+  }
+  const roundedValue = roundTemperatureValue(convertedValue, code);
+  if (code === 'temp_current' && deviceFeature) {
+    const min = Number(deviceFeature.min);
+    const max = Number(deviceFeature.max);
+    if (Number.isFinite(min) && Number.isFinite(max)) {
+      const isConvertedInRange = roundedValue >= min && roundedValue <= max;
+      const isRawInRange = numericValue >= min && numericValue <= max;
+      if (!isConvertedInRange && isRawInRange) {
+        return roundTemperatureValue(numericValue, code);
+      }
+    }
+  }
+  return roundedValue;
+};
+
+const getTemperatureUnitFromLocalDps = (device, dps) => {
+  if (!device || !dps || !device.properties || !Array.isArray(device.properties.properties)) {
+    return null;
+  }
+  const unitProperty = device.properties.properties.find(
+    (property) => property.code === 'temp_unit_convert' || property.code === 'unit',
+  );
+  if (!unitProperty || unitProperty.dp_id === undefined || unitProperty.dp_id === null) {
+    return null;
+  }
+  const rawValue = Object.prototype.hasOwnProperty.call(dps, String(unitProperty.dp_id))
+    ? dps[String(unitProperty.dp_id)]
+    : dps[unitProperty.dp_id];
+  updatePropertyValue(device, unitProperty.code, rawValue);
+  return normalizeTemperatureUnit(rawValue);
+};
+
+const getTemperatureUnitFromValues = (values) => {
+  if (!values) {
+    return null;
+  }
+  return normalizeTemperatureUnit(values.temp_unit_convert || values.unit);
+};
+
+const extractValuesFromResultArray = (device, result) => {
   const values = {};
   const entries = Array.isArray(result) ? result : [];
   entries.forEach((feature) => {
@@ -105,17 +223,37 @@ const extractValuesFromResultArray = (result) => {
       return;
     }
     values[String(feature.code)] = feature.value;
+    updatePropertyValue(device, feature.code, feature.value);
   });
   return values;
 };
 
-const extractShadowValues = (response) => {
+const extractShadowValues = (device, response) => {
   const payload = response && response.result;
-  const properties = payload && Array.isArray(payload.properties) ? payload.properties : [];
-  return extractValuesFromResultArray(properties);
+  const result = payload && Array.isArray(payload.properties) ? payload.properties : [];
+  return extractValuesFromResultArray(device, result);
 };
 
-const pollCloudFeatures = async function pollCloudFeatures(device, deviceFeatures, topic) {
+const transformFeatureValue = (device, deviceFeature, code, rawValue, deviceTemperatureUnit) => {
+  const featureWithFallbackScale = getFeatureWithFallbackScale(device, deviceFeature, code);
+  const reader = getFeatureReader(featureWithFallbackScale);
+  if (!reader) {
+    return { skipped: true };
+  }
+  let transformedValue = reader(rawValue, featureWithFallbackScale);
+  if (isTemperatureFeature(featureWithFallbackScale, code)) {
+    transformedValue = convertTemperatureValue(
+      transformedValue,
+      deviceTemperatureUnit,
+      featureWithFallbackScale.unit,
+      featureWithFallbackScale,
+      code,
+    );
+  }
+  return { transformedValue };
+};
+
+const pollCloudFeatures = async function pollCloudFeatures(device, deviceFeatures, topic, currentTemperatureUnit) {
   const summary = {
     polled: Array.isArray(deviceFeatures) ? deviceFeatures.length : 0,
     handled: 0,
@@ -132,9 +270,9 @@ const pollCloudFeatures = async function pollCloudFeatures(device, deviceFeature
     return summary;
   }
 
-  const cloudReadStrategy = getConfiguredCloudReadStrategy(device);
+  const cloudStrategy = getConfiguredCloudStrategy(device);
   const response =
-    cloudReadStrategy === CLOUD_STRATEGY.SHADOW
+    cloudStrategy === CLOUD_STRATEGY.SHADOW
       ? await this.connector.request({
           method: 'GET',
           path: `${API.VERSION_2_0}/thing/${topic}/shadow/properties`,
@@ -145,9 +283,11 @@ const pollCloudFeatures = async function pollCloudFeatures(device, deviceFeature
         });
 
   const values =
-    cloudReadStrategy === CLOUD_STRATEGY.SHADOW
-      ? extractShadowValues(response)
-      : extractValuesFromResultArray(response && response.result);
+    cloudStrategy === CLOUD_STRATEGY.SHADOW
+      ? extractShadowValues(device, response)
+      : extractValuesFromResultArray(device, response && response.result);
+
+  const deviceTemperatureUnit = getTemperatureUnitFromValues(values) || currentTemperatureUnit;
 
   deviceFeatures.forEach((deviceFeature) => {
     const code = getFeatureCode(deviceFeature);
@@ -167,22 +307,25 @@ const pollCloudFeatures = async function pollCloudFeatures(device, deviceFeature
       summary.missing += 1;
       return;
     }
-    let transformedValue;
     try {
-      transformedValue = reader(value, deviceFeature);
+      const resultValue = transformFeatureValue(device, deviceFeature, code, value, deviceTemperatureUnit);
+      if (resultValue.skipped) {
+        summary.skipped += 1;
+        return;
+      }
+      const { transformedValue } = resultValue;
+      const { lastValue, lastValueChanged } = getCurrentFeatureState(this.gladys, deviceFeature);
+      const { changed } = emitFeatureState(this.gladys, deviceFeature, transformedValue, lastValue, lastValueChanged);
+      if (changed) {
+        summary.changed += 1;
+      }
+      summary.handled += 1;
     } catch (e) {
       summary.skipped += 1;
       logger.warn(`[Tuya][poll][cloud] reader failed for device=${topic} code=${code}`, e);
-      return;
     }
-    const { lastValue, lastValueChanged } = getCurrentFeatureState(this.gladys, deviceFeature);
-    const { changed } = emitFeatureState(this.gladys, deviceFeature, transformedValue, lastValue, lastValueChanged);
-    if (changed) {
-      summary.changed += 1;
-    }
-    summary.handled += 1;
   });
-
+  summary.temperatureUnit = deviceTemperatureUnit;
   return summary;
 };
 
@@ -213,6 +356,7 @@ async function poll(device) {
   const protocolVersion =
     protocolVersionRaw !== null && protocolVersionRaw !== undefined ? String(protocolVersionRaw).trim() : undefined;
   const localOverride = normalizeBoolean(getParamValue(params, DEVICE_PARAM_NAME.LOCAL_OVERRIDE));
+  let deviceTemperatureUnit = getTemperatureUnitFromProperties(device);
   const hasLocalConfig = Boolean(ipAddress && localKey && protocolVersion && localOverride === true);
   const requestedMode = localOverride === true ? 'local' : 'cloud';
   logger.debug(
@@ -254,6 +398,7 @@ async function poll(device) {
 
       const dps = localResult && localResult.dps ? localResult.dps : null;
       if (dps && typeof dps === 'object') {
+        deviceTemperatureUnit = getTemperatureUnitFromLocalDps(device, dps) || deviceTemperatureUnit;
         const pendingCloudFeatures = [];
 
         deviceFeatures.forEach((deviceFeature) => {
@@ -273,26 +418,29 @@ async function poll(device) {
             pendingCloudFeatures.push(deviceFeature);
             return;
           }
-          let transformedValue;
           try {
-            transformedValue = reader(rawValue, deviceFeature);
+            const resultValue = transformFeatureValue(device, deviceFeature, code, rawValue, deviceTemperatureUnit);
+            if (resultValue.skipped) {
+              pendingCloudFeatures.push(deviceFeature);
+              return;
+            }
+            const { transformedValue } = resultValue;
+            const { lastValue, lastValueChanged } = getCurrentFeatureState(this.gladys, deviceFeature);
+            const { changed } = emitFeatureState(
+              this.gladys,
+              deviceFeature,
+              transformedValue,
+              lastValue,
+              lastValueChanged,
+            );
+            if (changed) {
+              localChanged += 1;
+            }
+            localHandled += 1;
           } catch (e) {
             pendingCloudFeatures.push(deviceFeature);
             logger.warn(`[Tuya][poll] local reader failed for device=${topic} code=${code}; falling back to cloud`, e);
-            return;
-          }
-          const { lastValue, lastValueChanged } = getCurrentFeatureState(this.gladys, deviceFeature);
-          const { changed } = emitFeatureState(
-            this.gladys,
-            deviceFeature,
-            transformedValue,
-            lastValue,
-            lastValueChanged,
-          );
-          if (changed) {
-            localChanged += 1;
           }
-          localHandled += 1;
         });
 
         if (pendingCloudFeatures.length === 0) {
@@ -305,7 +453,8 @@ async function poll(device) {
 
         fallbackReason = 'partial_local_mapping';
         try {
-          cloudSummary = await pollCloudFeatures.call(this, device, pendingCloudFeatures, topic);
+          cloudSummary = await pollCloudFeatures.call(this, device, pendingCloudFeatures, topic, deviceTemperatureUnit);
+          deviceTemperatureUnit = cloudSummary.temperatureUnit || deviceTemperatureUnit;
         } catch (e) {
           logger.warn(`[Tuya][poll] local poll succeeded but cloud fallback failed for ${topic}`, e);
           fallbackReason = 'cloud_fallback_failed';
@@ -326,7 +475,7 @@ async function poll(device) {
   }
 
   try {
-    cloudSummary = await pollCloudFeatures.call(this, device, deviceFeatures, topic);
+    cloudSummary = await pollCloudFeatures.call(this, device, deviceFeatures, topic, deviceTemperatureUnit);
   } catch (e) {
     logger.warn(`[Tuya][poll] cloud poll failed for ${topic}`, e);
     fallbackReason = fallbackReason === 'none' ? 'cloud_poll_failed' : `${fallbackReason}+cloud_poll_failed`;
diff --git a/server/services/tuya/lib/tuya.setValue.js b/server/services/tuya/lib/tuya.setValue.js
index a47b242645..fefafa5b0c 100644
--- a/server/services/tuya/lib/tuya.setValue.js
+++ b/server/services/tuya/lib/tuya.setValue.js
@@ -3,11 +3,92 @@ const TuyAPINewGen = require('@demirdeniz/tuyapi-newgen');
 const logger = require('../../../utils/logger');
 const { API } = require('./utils/tuya.constants');
 const { BadParameters } = require('../../../utils/coreErrors');
+const { DEVICE_FEATURE_UNITS } = require('../../../utils/constants');
+const { celsiusToFahrenheit, fahrenheitToCelsius } = require('../../../utils/units');
 const { writeValues } = require('./device/tuya.deviceMapping');
 const { DEVICE_PARAM_NAME } = require('./utils/tuya.constants');
-const { normalizeBoolean } = require('./utils/tuya.normalize');
+const { CLOUD_STRATEGY, getConfiguredCloudStrategy } = require('./utils/tuya.cloudStrategy');
+const { normalizeBoolean, normalizeTemperatureUnit } = require('./utils/tuya.normalize');
 const { getParamValue } = require('./utils/tuya.deviceParams');
 const { getLocalDpsFromCode } = require('./device/tuya.localMapping');
+const { getDeviceType, getFeatureMapping } = require('./mappings');
+
+const FEEDBACK_POLL_DELAY_MS = 1000;
+
+const sleep = (duration) =>
+  new Promise((resolve) => {
+    setTimeout(resolve, duration);
+  });
+
+const getTemperatureUnitFromProperties = (device) => {
+  if (!device || !device.properties || !Array.isArray(device.properties.properties)) {
+    return null;
+  }
+  const unitProperty = device.properties.properties.find(
+    (property) => property && (property.code === 'temp_unit_convert' || property.code === 'unit'),
+  );
+  return normalizeTemperatureUnit(unitProperty && unitProperty.value);
+};
+
+const getFeatureWithFallbackScale = (device, deviceFeature, command) => {
+  if (!deviceFeature || deviceFeature.scale !== undefined) {
+    return deviceFeature;
+  }
+  const deviceType = device && device.device_type ? device.device_type : getDeviceType(device);
+  const mapping = getFeatureMapping(command, deviceType);
+  if (!mapping || mapping.scale === undefined) {
+    return deviceFeature;
+  }
+  return {
+    ...deviceFeature,
+    scale: mapping.scale,
+  };
+};
+
+const convertTemperatureForDevice = (value, deviceFeature, deviceTemperatureUnit) => {
+  if (
+    !deviceFeature ||
+    !deviceFeature.unit ||
+    !deviceTemperatureUnit ||
+    deviceFeature.unit === deviceTemperatureUnit ||
+    deviceFeature.type !== 'target-temperature'
+  ) {
+    return value;
+  }
+  const numericValue = Number(value);
+  if (!Number.isFinite(numericValue)) {
+    return value;
+  }
+  if (
+    deviceFeature.unit === DEVICE_FEATURE_UNITS.CELSIUS &&
+    deviceTemperatureUnit === DEVICE_FEATURE_UNITS.FAHRENHEIT
+  ) {
+    return Math.round(celsiusToFahrenheit(numericValue));
+  }
+  if (
+    deviceFeature.unit === DEVICE_FEATURE_UNITS.FAHRENHEIT &&
+    deviceTemperatureUnit === DEVICE_FEATURE_UNITS.CELSIUS
+  ) {
+    return Math.round(fahrenheitToCelsius(numericValue));
+  }
+  return value;
+};
+
+const pollFeedbackIfAvailable = async (context, device, topic, command, reason) => {
+  if (typeof context.poll !== 'function' || !device || !device.external_id) {
+    return;
+  }
+  try {
+    const delayMs =
+      context && Number.isFinite(context.feedbackPollDelayMs) ? context.feedbackPollDelayMs : FEEDBACK_POLL_DELAY_MS;
+    if (delayMs > 0) {
+      await sleep(delayMs);
+    }
+    await context.poll(device);
+  } catch (e) {
+    logger.warn(`[Tuya][setValue] feedback poll failed after ${reason} for ${topic}/${command}`, e);
+  }
+};
 
 /**
  * @description Send the new device value over device protocol.
@@ -31,12 +112,16 @@ async function setValue(device, deviceFeature, value) {
     throw new BadParameters(`Tuya device external_id is invalid: "${externalId}" have no command`);
   }
 
+  const effectiveDevice = device;
+  const effectiveFeature = getFeatureWithFallbackScale(effectiveDevice, deviceFeature, command);
+  const deviceTemperatureUnit = getTemperatureUnitFromProperties(effectiveDevice);
+  const convertedValue = convertTemperatureForDevice(value, effectiveFeature, deviceTemperatureUnit);
   const writeCategory = writeValues[deviceFeature.category];
   const writeFn = writeCategory ? writeCategory[deviceFeature.type] : null;
-  const transformedValue = writeFn ? writeFn(value) : value;
+  const transformedValue = writeFn ? writeFn(convertedValue, effectiveFeature) : convertedValue;
   logger.debug(`Change value for devices ${topic}/${command} to value ${transformedValue}...`);
 
-  const params = device.params || [];
+  const params = effectiveDevice.params || [];
   const ipAddress = getParamValue(params, DEVICE_PARAM_NAME.IP_ADDRESS);
   const localKey = getParamValue(params, DEVICE_PARAM_NAME.LOCAL_KEY);
   const protocolVersionRaw = getParamValue(params, DEVICE_PARAM_NAME.PROTOCOL_VERSION);
@@ -46,7 +131,7 @@ async function setValue(device, deviceFeature, value) {
 
   const hasLocalConfig = ipAddress && localKey && protocolVersion && localOverride === true;
 
-  const localDps = getLocalDpsFromCode(command, device);
+  const localDps = getLocalDpsFromCode(command, effectiveDevice);
 
   if (hasLocalConfig && localDps !== null) {
     const isProtocol35 = protocolVersion === '3.5';
@@ -88,23 +173,46 @@ async function setValue(device, deviceFeature, value) {
 
     const localSuccess = await runLocalSet();
     if (localSuccess) {
+      await pollFeedbackIfAvailable(this, effectiveDevice, topic, command, 'local command');
       return;
     }
   }
 
-  const response = await this.connector.request({
-    method: 'POST',
-    path: `${API.VERSION_1_0}/devices/${topic}/commands`,
-    body: {
-      commands: [
-        {
-          code: command,
-          value: transformedValue,
-        },
-      ],
-    },
-  });
+  const cloudStrategy = getConfiguredCloudStrategy(effectiveDevice);
+
+  const response =
+    cloudStrategy === CLOUD_STRATEGY.SHADOW
+      ? await this.connector.request({
+          method: 'POST',
+          path: `${API.VERSION_2_0}/thing/${topic}/shadow/properties/issue`,
+          body: {
+            properties: JSON.stringify({
+              [command]: transformedValue,
+            }),
+          },
+        })
+      : await this.connector.request({
+          method: 'POST',
+          path: `${API.VERSION_1_0}/devices/${topic}/commands`,
+          body: {
+            commands: [
+              {
+                code: command,
+                value: transformedValue,
+              },
+            ],
+          },
+        });
   logger.debug(`[Tuya][setValue] ${JSON.stringify(response)}`);
+  if (!response || response.success === false) {
+    await pollFeedbackIfAvailable(this, effectiveDevice, topic, command, 'rejected cloud command');
+    throw new BadParameters(
+      `[Tuya][setValue] command rejected for ${topic}/${command}: ${
+        response && response.msg ? response.msg : 'unknown error'
+      }`,
+    );
+  }
+  await pollFeedbackIfAvailable(this, effectiveDevice, topic, command, 'cloud command');
 }
 
 module.exports = {
diff --git a/server/services/tuya/lib/utils/tuya.cloudStrategy.js b/server/services/tuya/lib/utils/tuya.cloudStrategy.js
index 97ac1f4671..480ce726a2 100644
--- a/server/services/tuya/lib/utils/tuya.cloudStrategy.js
+++ b/server/services/tuya/lib/utils/tuya.cloudStrategy.js
@@ -27,16 +27,22 @@ const getThingModelProperties = (device) => {
   );
 };
 
-const resolveCloudReadStrategy = (device, deviceType) => {
+const resolveCloudStrategy = (device, deviceType) => {
   const ignoredCloudCodes = getIgnoredCloudCodes(deviceType);
+  const functions = Array.isArray(device && device.specifications && device.specifications.functions)
+    ? device.specifications.functions
+    : [];
   const status = Array.isArray(device && device.specifications && device.specifications.status)
     ? device.specifications.status
     : [];
-  if (status.some((entry) => isSupportedCloudCode(entry && entry.code, deviceType, ignoredCloudCodes))) {
+  if (
+    functions.some((entry) => isSupportedCloudCode(entry && entry.code, deviceType, ignoredCloudCodes)) ||
+    status.some((entry) => isSupportedCloudCode(entry && entry.code, deviceType, ignoredCloudCodes))
+  ) {
     return CLOUD_STRATEGY.LEGACY;
   }
   const thingProperties = getThingModelProperties(device);
-  if (thingProperties.some((entry) => isSupportedCloudCode(entry && entry.code, deviceType, ignoredCloudCodes))) {
+  if (thingProperties.some((entry) => entry && isSupportedCloudCode(entry.code, deviceType, ignoredCloudCodes))) {
     return CLOUD_STRATEGY.SHADOW;
   }
   return null;
@@ -45,11 +51,11 @@ const resolveCloudReadStrategy = (device, deviceType) => {
 const normalizeCloudStrategy = (value) =>
   value === CLOUD_STRATEGY.SHADOW ? CLOUD_STRATEGY.SHADOW : CLOUD_STRATEGY.LEGACY;
 
-const getConfiguredCloudReadStrategy = (device) =>
-  normalizeCloudStrategy(getParamValue(device && device.params, DEVICE_PARAM_NAME.CLOUD_READ_STRATEGY));
+const getConfiguredCloudStrategy = (device) =>
+  normalizeCloudStrategy(getParamValue(device && device.params, DEVICE_PARAM_NAME.CLOUD_STRATEGY));
 
 module.exports = {
   CLOUD_STRATEGY,
-  getConfiguredCloudReadStrategy,
-  resolveCloudReadStrategy,
+  getConfiguredCloudStrategy,
+  resolveCloudStrategy,
 };
diff --git a/server/services/tuya/lib/utils/tuya.constants.js b/server/services/tuya/lib/utils/tuya.constants.js
index 478599fbe7..6d812fc3cc 100644
--- a/server/services/tuya/lib/utils/tuya.constants.js
+++ b/server/services/tuya/lib/utils/tuya.constants.js
@@ -42,7 +42,7 @@ const DEVICE_PARAM_NAME = {
   IP_ADDRESS: 'IP_ADDRESS',
   PROTOCOL_VERSION: 'PROTOCOL_VERSION',
   CLOUD_IP: 'CLOUD_IP',
-  CLOUD_READ_STRATEGY: 'CLOUD_READ_STRATEGY',
+  CLOUD_STRATEGY: 'CLOUD_STRATEGY',
   LOCAL_OVERRIDE: 'LOCAL_OVERRIDE',
   PRODUCT_ID: 'PRODUCT_ID',
   PRODUCT_KEY: 'PRODUCT_KEY',
diff --git a/server/services/tuya/lib/utils/tuya.normalize.js b/server/services/tuya/lib/utils/tuya.normalize.js
index 3bcd035346..d00ddc15bb 100644
--- a/server/services/tuya/lib/utils/tuya.normalize.js
+++ b/server/services/tuya/lib/utils/tuya.normalize.js
@@ -1,3 +1,5 @@
+const { DEVICE_FEATURE_UNITS } = require('../../../../utils/constants');
+
 const normalizeBoolean = (value) => {
   if (value === true || value === 1 || value === '1') {
     return true;
@@ -5,6 +7,35 @@ const normalizeBoolean = (value) => {
   return typeof value === 'string' && ['true', 'on'].includes(value.trim().toLowerCase());
 };
 
+const normalizeTemperatureUnit = (value) => {
+  if (value === null || value === undefined) {
+    return null;
+  }
+  const normalized = String(value)
+    .trim()
+    .toLowerCase();
+  if (
+    normalized === 'c' ||
+    normalized === '℃' ||
+    normalized === 'celsius' ||
+    normalized === 'centigrade' ||
+    normalized === 'celcius' ||
+    normalized === DEVICE_FEATURE_UNITS.CELSIUS
+  ) {
+    return DEVICE_FEATURE_UNITS.CELSIUS;
+  }
+  if (
+    normalized === 'f' ||
+    normalized === '℉' ||
+    normalized === 'fahrenheit' ||
+    normalized === DEVICE_FEATURE_UNITS.FAHRENHEIT
+  ) {
+    return DEVICE_FEATURE_UNITS.FAHRENHEIT;
+  }
+  return null;
+};
+
 module.exports = {
   normalizeBoolean,
+  normalizeTemperatureUnit,
 };
diff --git a/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/cloud-status.json b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/cloud-status.json
new file mode 100644
index 0000000000..5eda318ffe
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/cloud-status.json
@@ -0,0 +1,42 @@
+{
+  "result": {
+    "properties": [
+      { "code": "mode", "value": "Anti_forst" },
+      { "code": "child_lock", "value": false },
+      { "code": "week_program_1", "value": "VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV" },
+      { "code": "week_program_2", "value": "VVVVVVVVVSIhEVVRElEVURURFVVVVVVV" },
+      { "code": "week_program_3", "value": "VVVVVVVVVSIhEVVRFVEVURURFVVVVVVV" },
+      { "code": "week_program_4", "value": "VVVVVVVVVSIhEVVRFVEVURURVVVVVVVV" },
+      { "code": "week_program_5", "value": "VVVVVVVVVSIhEVVRFVEVURURVVVVVVVV" },
+      { "code": "week_program_6", "value": "VVVVVVVVVSIhEVVRFVEVURVVVVVVVVVV" },
+      { "code": "week_program_7", "value": "VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV" },
+      { "code": "vacation_duration", "value": 0 },
+      { "code": "boost_duration", "value": 0 },
+      { "code": "electricity_statistics", "value": 0 },
+      {
+        "code": "elec_statistics_day",
+        "value": "AAAAAAAAAAAAAAAAAAAAAAAAAcAhAuAAAAAqBHAABCAEAAAAA5BZBXCkD4AAAABJ"
+      },
+      { "code": "elec_statistics_month", "value": "AAADpwjGB1sEqwAAAAAAAAAAAAAAAAAAAAA=" },
+      { "code": "elec_statistics_year", "value": "AAAMBg==" },
+      { "code": "temp_current", "value": 152 },
+      { "code": "average_power", "value": 20 },
+      { "code": "temp_correction", "value": 0 },
+      { "code": "fault", "value": 0 },
+      { "code": "air_pressure_index", "value": "H4ppqtom8Ljr3qW5xnTAeqoAiTyiz2E9" },
+      { "code": "support_features", "value": 31 },
+      { "code": "window_check", "value": true },
+      { "code": "window_state", "value": false },
+      { "code": "window_keep_time", "value": 30 },
+      { "code": "temp_set", "value": 210 },
+      { "code": "temp_unit_convert", "value": "c" },
+      { "code": "app_features", "value": 2 },
+      { "code": "switch_diff", "value": 10 },
+      { "code": "upper_temp", "value": 350 },
+      { "code": "lower_temp", "value": 50 },
+      { "code": "running_mode", "value": "Anti_forst" },
+      { "code": "night_led_config", "value": "BLAB4AE=" },
+      { "code": "ecowatt_url", "value": "" }
+    ]
+  }
+}
diff --git a/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/expected-device.json b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/expected-device.json
new file mode 100644
index 0000000000..f7e4a4e67c
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/expected-device.json
@@ -0,0 +1,173 @@
+{
+  "device_type": "pilot-thermostat",
+  "external_id": "tuya:bfc3c1dcdd95241afal8mo",
+  "features": [
+    {
+      "category": "child-lock",
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:child_lock",
+      "has_feedback": true,
+      "max": 1,
+      "min": 0,
+      "name": "child_lock",
+      "read_only": false,
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:child_lock",
+      "type": "binary"
+    },
+    {
+      "category": "energy-sensor",
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:average_power",
+      "has_feedback": false,
+      "max": 2000000000,
+      "min": 0,
+      "name": "average_power",
+      "read_only": true,
+      "scale": 1,
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:average_power",
+      "type": "power",
+      "unit": "watt"
+    },
+    {
+      "category": "energy-sensor",
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:electricity_statistics",
+      "has_feedback": false,
+      "max": 2000000000,
+      "min": 0,
+      "name": "electricity_statistics",
+      "read_only": true,
+      "scale": 1,
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:electricity_statistics",
+      "type": "index-today",
+      "unit": "kilowatt-hour"
+    },
+    {
+      "category": "heater",
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:mode",
+      "has_feedback": true,
+      "max": 1,
+      "min": 0,
+      "name": "mode",
+      "read_only": false,
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:mode",
+      "type": "pilot-wire-mode"
+    },
+    {
+      "category": "heater",
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:running_mode",
+      "has_feedback": false,
+      "max": 1,
+      "min": 0,
+      "name": "running_mode",
+      "read_only": true,
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:running_mode",
+      "type": "pilot-wire-mode"
+    },
+    {
+      "category": "opening-sensor",
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:window_state",
+      "has_feedback": false,
+      "max": 1,
+      "min": 0,
+      "name": "window_state",
+      "read_only": true,
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:window_state",
+      "type": "binary"
+    },
+    {
+      "category": "temperature-sensor",
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:temp_current",
+      "has_feedback": false,
+      "max": 9000,
+      "min": -300,
+      "name": "temp_current",
+      "read_only": true,
+      "scale": 1,
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:temp_current",
+      "type": "decimal",
+      "unit": "celsius"
+    },
+    {
+      "category": "thermostat",
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:temp_set",
+      "has_feedback": true,
+      "max": 300,
+      "min": 5,
+      "name": "temp_set",
+      "read_only": false,
+      "scale": 1,
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:temp_set",
+      "type": "target-temperature",
+      "unit": "celsius"
+    }
+  ],
+  "model": "Pilote Thermostat",
+  "name": "Thermostat Bureau Psycho",
+  "online": true,
+  "params": {
+    "CLOUD_STRATEGY": "shadow",
+    "CLOUD_IP": "82.0.0.1",
+    "DEVICE_ID": "bfc3c1dcdd95241afal8mo",
+    "IP_ADDRESS": "10.0.0.15",
+    "LOCAL_KEY": "local-key",
+    "LOCAL_OVERRIDE": true,
+    "PRODUCT_ID": "c03zek9b5daz7omr",
+    "PROTOCOL_VERSION": "3.5"
+  },
+  "poll_frequency": 10000,
+  "product_id": "c03zek9b5daz7omr",
+  "selector": "tuya:bfc3c1dcdd95241afal8mo",
+  "should_poll": true,
+  "tuya_mapping": {
+    "ignored_cloud_codes": [
+      "air_pressure_index",
+      "app_features",
+      "boost_duration",
+      "ecowatt_url",
+      "elec_statistics_day",
+      "elec_statistics_month",
+      "elec_statistics_year",
+      "lower_temp",
+      "night_led_config",
+      "support_features",
+      "switch_diff",
+      "temp_correction",
+      "temp_unit_convert",
+      "upper_temp",
+      "vacation_duration",
+      "week_program_1",
+      "week_program_2",
+      "week_program_3",
+      "week_program_4",
+      "week_program_5",
+      "week_program_6",
+      "week_program_7",
+      "window_check",
+      "window_keep_time"
+    ],
+    "ignored_local_dps": [
+      "103",
+      "104",
+      "105",
+      "106",
+      "107",
+      "108",
+      "109",
+      "110",
+      "111",
+      "113",
+      "114",
+      "115",
+      "118",
+      "120",
+      "121",
+      "122",
+      "124",
+      "126",
+      "127",
+      "128",
+      "129",
+      "130",
+      "132",
+      "133"
+    ]
+  }
+}
diff --git a/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/expected-events.json b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/expected-events.json
new file mode 100644
index 0000000000..6cb016ca8e
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/expected-events.json
@@ -0,0 +1,34 @@
+[
+  {
+    "device_feature_external_id": "tuya:bfc3c1dcdd95241afal8mo:average_power",
+    "state": 2
+  },
+  {
+    "device_feature_external_id": "tuya:bfc3c1dcdd95241afal8mo:child_lock",
+    "state": 0
+  },
+  {
+    "device_feature_external_id": "tuya:bfc3c1dcdd95241afal8mo:electricity_statistics",
+    "state": 0
+  },
+  {
+    "device_feature_external_id": "tuya:bfc3c1dcdd95241afal8mo:mode",
+    "state": 1
+  },
+  {
+    "device_feature_external_id": "tuya:bfc3c1dcdd95241afal8mo:running_mode",
+    "state": 1
+  },
+  {
+    "device_feature_external_id": "tuya:bfc3c1dcdd95241afal8mo:temp_current",
+    "state": 15.2
+  },
+  {
+    "device_feature_external_id": "tuya:bfc3c1dcdd95241afal8mo:temp_set",
+    "state": 21
+  },
+  {
+    "device_feature_external_id": "tuya:bfc3c1dcdd95241afal8mo:window_state",
+    "state": 1
+  }
+]
diff --git a/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/expected-local-mapping.json b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/expected-local-mapping.json
new file mode 100644
index 0000000000..f7bb7bb52f
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/expected-local-mapping.json
@@ -0,0 +1,10 @@
+{
+  "mode": 101,
+  "child_lock": 102,
+  "electricity_statistics": 112,
+  "temp_current": 116,
+  "average_power": 117,
+  "window_state": 123,
+  "temp_set": 125,
+  "running_mode": 131
+}
diff --git a/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/input-device.json b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/input-device.json
new file mode 100644
index 0000000000..1e20d53e44
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/input-device.json
@@ -0,0 +1,154 @@
+{
+  "id": "bfc3c1dcdd95241afal8mo",
+  "name": "Thermostat Bureau Psycho",
+  "product_name": "Pilote Thermostat",
+  "model": "RP5",
+  "product_id": "c03zek9b5daz7omr",
+  "local_key": "local-key",
+  "ip": "10.0.0.15",
+  "cloud_ip": "82.0.0.1",
+  "protocol_version": "3.5",
+  "local_override": true,
+  "online": true,
+  "specifications": {
+    "category": "cjkg",
+    "functions": [],
+    "status": []
+  },
+  "properties": {
+    "properties": [
+      { "code": "mode", "dp_id": 101, "type": "enum", "value": "Anti_forst" },
+      { "code": "child_lock", "dp_id": 102, "type": "bool", "value": false },
+      { "code": "week_program_1", "dp_id": 103, "type": "raw", "value": "VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV" },
+      { "code": "week_program_2", "dp_id": 104, "type": "raw", "value": "VVVVVVVVVSIhEVVRElEVURURFVVVVVVV" },
+      { "code": "week_program_3", "dp_id": 105, "type": "raw", "value": "VVVVVVVVVSIhEVVRFVEVURURFVVVVVVV" },
+      { "code": "week_program_4", "dp_id": 106, "type": "raw", "value": "VVVVVVVVVSIhEVVRFVEVURURVVVVVVVV" },
+      { "code": "week_program_5", "dp_id": 107, "type": "raw", "value": "VVVVVVVVVSIhEVVRFVEVURURVVVVVVVV" },
+      { "code": "week_program_6", "dp_id": 108, "type": "raw", "value": "VVVVVVVVVSIhEVVRFVEVURVVVVVVVVVV" },
+      { "code": "week_program_7", "dp_id": 109, "type": "raw", "value": "VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV" },
+      { "code": "vacation_duration", "dp_id": 110, "type": "value", "value": 0 },
+      { "code": "boost_duration", "dp_id": 111, "type": "value", "value": 0 },
+      { "code": "electricity_statistics", "dp_id": 112, "type": "value", "value": 0 },
+      {
+        "code": "elec_statistics_day",
+        "dp_id": 113,
+        "type": "raw",
+        "value": "AAAAAAAAAAAAAAAAAAAAAAAAAcAhAuAAAAAqBHAABCAEAAAAA5BZBXCkD4AAAABJ"
+      },
+      {
+        "code": "elec_statistics_month",
+        "dp_id": 114,
+        "type": "raw",
+        "value": "AAADpwjGB1sEqwAAAAAAAAAAAAAAAAAAAAA="
+      },
+      { "code": "elec_statistics_year", "dp_id": 115, "type": "raw", "value": "AAAMBg==" },
+      { "code": "temp_current", "dp_id": 116, "type": "value", "value": 152 },
+      { "code": "average_power", "dp_id": 117, "type": "value", "value": 20 },
+      { "code": "temp_correction", "dp_id": 118, "type": "value", "value": 0 },
+      { "code": "fault", "dp_id": 119, "type": "bitmap", "value": 0 },
+      { "code": "air_pressure_index", "dp_id": 120, "type": "raw", "value": "H4ppqtom8Ljr3qW5xnTAeqoAiTyiz2E9" },
+      { "code": "support_features", "dp_id": 121, "type": "value", "value": 31 },
+      { "code": "window_check", "dp_id": 122, "type": "bool", "value": true },
+      { "code": "window_state", "dp_id": 123, "type": "bool", "value": false },
+      { "code": "window_keep_time", "dp_id": 124, "type": "value", "value": 30 },
+      { "code": "temp_set", "dp_id": 125, "type": "value", "value": 210 },
+      { "code": "temp_unit_convert", "dp_id": 126, "type": "enum", "value": "c" },
+      { "code": "app_features", "dp_id": 127, "type": "value", "value": 2 },
+      { "code": "switch_diff", "dp_id": 128, "type": "value", "value": 10 },
+      { "code": "upper_temp", "dp_id": 129, "type": "value", "value": 350 },
+      { "code": "lower_temp", "dp_id": 130, "type": "value", "value": 50 },
+      { "code": "running_mode", "dp_id": 131, "type": "enum", "value": "Anti_forst" },
+      { "code": "night_led_config", "dp_id": 132, "type": "raw", "value": "BLAB4AE=" },
+      { "code": "ecowatt_url", "dp_id": 133, "type": "string", "value": "" }
+    ]
+  },
+  "thing_model": {
+    "modelId": "fjl7k0",
+    "services": [
+      {
+        "code": "",
+        "name": "Default service",
+        "properties": [
+          {
+            "abilityId": 101,
+            "accessMode": "rw",
+            "code": "mode",
+            "name": "Mode",
+            "typeSpec": {
+              "type": "enum",
+              "range": [
+                "Standby",
+                "Comfort",
+                "Comfort_1",
+                "Comfort_2",
+                "ECO",
+                "Anti_forst",
+                "Programming",
+                "Thermostat"
+              ]
+            }
+          },
+          {
+            "abilityId": 102,
+            "accessMode": "rw",
+            "code": "child_lock",
+            "name": "Child lock",
+            "typeSpec": { "type": "bool" }
+          },
+          {
+            "abilityId": 112,
+            "accessMode": "ro",
+            "code": "electricity_statistics",
+            "name": "Electricity statistics",
+            "typeSpec": { "type": "value", "max": 2000000000, "min": 0, "scale": 1, "step": 1, "unit": "kWh" }
+          },
+          {
+            "abilityId": 116,
+            "accessMode": "ro",
+            "code": "temp_current",
+            "name": "Current temperature",
+            "typeSpec": { "type": "value", "max": 9000, "min": -300, "scale": 1, "step": 1, "unit": "" }
+          },
+          {
+            "abilityId": 117,
+            "accessMode": "ro",
+            "code": "average_power",
+            "name": "Average power",
+            "typeSpec": { "type": "value", "max": 2000000000, "min": 0, "scale": 1, "step": 1, "unit": "W" }
+          },
+          {
+            "abilityId": 119,
+            "accessMode": "ro",
+            "code": "fault",
+            "name": "Fault",
+            "typeSpec": { "type": "bitmap", "label": ["e1", "e2"], "maxlen": 2 }
+          },
+          {
+            "abilityId": 123,
+            "accessMode": "ro",
+            "code": "window_state",
+            "name": "Window state",
+            "typeSpec": { "type": "bool" }
+          },
+          {
+            "abilityId": 125,
+            "accessMode": "rw",
+            "code": "temp_set",
+            "name": "Target temperature",
+            "typeSpec": { "type": "value", "max": 3000, "min": 50, "scale": 1, "step": 5, "unit": "" }
+          },
+          {
+            "abilityId": 131,
+            "accessMode": "ro",
+            "code": "running_mode",
+            "name": "Running mode",
+            "typeSpec": {
+              "type": "enum",
+              "range": ["Standby", "Comfort", "Comfort_1", "Comfort_2", "ECO", "Anti_forst"]
+            }
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/local-dps.json b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/local-dps.json
new file mode 100644
index 0000000000..8d0a728674
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/local-dps.json
@@ -0,0 +1,22 @@
+{
+  "101": "Anti_forst",
+  "102": false,
+  "110": 0,
+  "111": 0,
+  "112": 0,
+  "116": 152,
+  "117": 20,
+  "118": 0,
+  "119": 0,
+  "121": 31,
+  "122": true,
+  "123": false,
+  "124": 30,
+  "125": 210,
+  "126": "c",
+  "127": 2,
+  "128": 10,
+  "129": 350,
+  "130": 50,
+  "131": "Anti_forst"
+}
diff --git a/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/manifest.js b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/manifest.js
new file mode 100644
index 0000000000..02c3b7248e
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/manifest.js
@@ -0,0 +1,32 @@
+module.exports = {
+  name: 'Thermostat Bureau Psycho',
+  convertDevice: {
+    input: './input-device.json',
+    expected: './expected-device.json',
+  },
+  pollCloud: {
+    device: './poll-device.json',
+    response: './cloud-status.json',
+    expectedEvents: './expected-events.json',
+  },
+  pollLocal: {
+    device: './poll-device.json',
+    dps: './local-dps.json',
+    expectedEvents: './expected-events.json',
+    expectedCloudRequests: 0,
+  },
+  localMapping: {
+    device: './poll-device.json',
+    expected: './expected-local-mapping.json',
+  },
+  setValueLocal: {
+    device: './poll-device.json',
+    featureExternalId: 'tuya:bfc3c1dcdd95241afal8mo:mode',
+    inputValue: 6,
+    expectedLocalSet: {
+      dps: 101,
+      set: 'Programming',
+    },
+    expectedCloudRequests: 0,
+  },
+};
diff --git a/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/poll-device.json b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/poll-device.json
new file mode 100644
index 0000000000..534ed6c196
--- /dev/null
+++ b/server/test/services/tuya/fixtures/devices/pilote-thermostat-c03zek9b5daz7omr/poll-device.json
@@ -0,0 +1,174 @@
+{
+  "external_id": "tuya:bfc3c1dcdd95241afal8mo",
+  "device_type": "pilot-thermostat",
+  "properties": {
+    "properties": [
+      { "code": "mode", "dp_id": 101, "type": "enum", "value": "Anti_forst" },
+      { "code": "child_lock", "dp_id": 102, "type": "bool", "value": false },
+      { "code": "week_program_1", "dp_id": 103, "type": "raw", "value": "VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV" },
+      { "code": "week_program_2", "dp_id": 104, "type": "raw", "value": "VVVVVVVVVSIhEVVRElEVURURFVVVVVVV" },
+      { "code": "week_program_3", "dp_id": 105, "type": "raw", "value": "VVVVVVVVVSIhEVVRFVEVURURFVVVVVVV" },
+      { "code": "week_program_4", "dp_id": 106, "type": "raw", "value": "VVVVVVVVVSIhEVVRFVEVURURVVVVVVVV" },
+      { "code": "week_program_5", "dp_id": 107, "type": "raw", "value": "VVVVVVVVVSIhEVVRFVEVURURVVVVVVVV" },
+      { "code": "week_program_6", "dp_id": 108, "type": "raw", "value": "VVVVVVVVVSIhEVVRFVEVURVVVVVVVVVV" },
+      { "code": "week_program_7", "dp_id": 109, "type": "raw", "value": "VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV" },
+      { "code": "vacation_duration", "dp_id": 110, "type": "value", "value": 0 },
+      { "code": "boost_duration", "dp_id": 111, "type": "value", "value": 0 },
+      { "code": "electricity_statistics", "dp_id": 112, "type": "value", "value": 0 },
+      {
+        "code": "elec_statistics_day",
+        "dp_id": 113,
+        "type": "raw",
+        "value": "AAAAAAAAAAAAAAAAAAAAAAAAAcAhAuAAAAAqBHAABCAEAAAAA5BZBXCkD4AAAABJ"
+      },
+      {
+        "code": "elec_statistics_month",
+        "dp_id": 114,
+        "type": "raw",
+        "value": "AAADpwjGB1sEqwAAAAAAAAAAAAAAAAAAAAA="
+      },
+      { "code": "elec_statistics_year", "dp_id": 115, "type": "raw", "value": "AAAMBg==" },
+      { "code": "temp_current", "dp_id": 116, "type": "value", "value": 152 },
+      { "code": "average_power", "dp_id": 117, "type": "value", "value": 20 },
+      { "code": "temp_correction", "dp_id": 118, "type": "value", "value": 0 },
+      { "code": "fault", "dp_id": 119, "type": "bitmap", "value": 0 },
+      { "code": "air_pressure_index", "dp_id": 120, "type": "raw", "value": "H4ppqtom8Ljr3qW5xnTAeqoAiTyiz2E9" },
+      { "code": "support_features", "dp_id": 121, "type": "value", "value": 31 },
+      { "code": "window_check", "dp_id": 122, "type": "bool", "value": true },
+      { "code": "window_state", "dp_id": 123, "type": "bool", "value": false },
+      { "code": "window_keep_time", "dp_id": 124, "type": "value", "value": 30 },
+      { "code": "temp_set", "dp_id": 125, "type": "value", "value": 210 },
+      { "code": "temp_unit_convert", "dp_id": 126, "type": "enum", "value": "c" },
+      { "code": "app_features", "dp_id": 127, "type": "value", "value": 2 },
+      { "code": "switch_diff", "dp_id": 128, "type": "value", "value": 10 },
+      { "code": "upper_temp", "dp_id": 129, "type": "value", "value": 350 },
+      { "code": "lower_temp", "dp_id": 130, "type": "value", "value": 50 },
+      { "code": "running_mode", "dp_id": 131, "type": "enum", "value": "Anti_forst" },
+      { "code": "night_led_config", "dp_id": 132, "type": "raw", "value": "BLAB4AE=" },
+      { "code": "ecowatt_url", "dp_id": 133, "type": "string", "value": "" }
+    ]
+  },
+  "params": [
+    { "name": "IP_ADDRESS", "value": "10.0.0.15" },
+    { "name": "LOCAL_KEY", "value": "local-key" },
+    { "name": "PROTOCOL_VERSION", "value": "3.5" },
+    { "name": "LOCAL_OVERRIDE", "value": true },
+    { "name": "CLOUD_STRATEGY", "value": "shadow" }
+  ],
+  "features": [
+    {
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:mode",
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:mode",
+      "category": "heater",
+      "type": "pilot-wire-mode",
+      "last_value": 5
+    },
+    {
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:child_lock",
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:child_lock",
+      "category": "child-lock",
+      "type": "binary",
+      "last_value": 1
+    },
+    {
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:electricity_statistics",
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:electricity_statistics",
+      "category": "energy-sensor",
+      "type": "index-today",
+      "scale": 1,
+      "last_value": 1
+    },
+    {
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:temp_current",
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:temp_current",
+      "category": "temperature-sensor",
+      "type": "decimal",
+      "scale": 1,
+      "last_value": 1
+    },
+    {
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:average_power",
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:average_power",
+      "category": "energy-sensor",
+      "type": "power",
+      "scale": 1,
+      "last_value": 1
+    },
+    {
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:window_state",
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:window_state",
+      "category": "opening-sensor",
+      "type": "binary",
+      "last_value": 0
+    },
+    {
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:temp_set",
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:temp_set",
+      "category": "thermostat",
+      "type": "target-temperature",
+      "scale": 1,
+      "last_value": 18
+    },
+    {
+      "external_id": "tuya:bfc3c1dcdd95241afal8mo:running_mode",
+      "selector": "tuya:bfc3c1dcdd95241afal8mo:running_mode",
+      "category": "heater",
+      "type": "pilot-wire-mode",
+      "last_value": 5
+    }
+  ],
+  "tuya_mapping": {
+    "ignored_local_dps": [
+      "103",
+      "104",
+      "105",
+      "106",
+      "107",
+      "108",
+      "109",
+      "110",
+      "111",
+      "113",
+      "114",
+      "115",
+      "118",
+      "120",
+      "121",
+      "122",
+      "124",
+      "126",
+      "127",
+      "128",
+      "129",
+      "130",
+      "132",
+      "133"
+    ],
+    "ignored_cloud_codes": [
+      "week_program_1",
+      "week_program_2",
+      "week_program_3",
+      "week_program_4",
+      "week_program_5",
+      "week_program_6",
+      "week_program_7",
+      "vacation_duration",
+      "boost_duration",
+      "elec_statistics_day",
+      "elec_statistics_month",
+      "elec_statistics_year",
+      "temp_correction",
+      "air_pressure_index",
+      "support_features",
+      "window_check",
+      "window_keep_time",
+      "temp_unit_convert",
+      "app_features",
+      "switch_diff",
+      "upper_temp",
+      "lower_temp",
+      "night_led_config",
+      "ecowatt_url"
+    ]
+  }
+}
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
index 94fc0f67ac..1e36288c1c 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/expected-device.json
@@ -10,7 +10,7 @@
   "poll_frequency": 10000,
   "should_poll": true,
   "params": {
-    "CLOUD_READ_STRATEGY": "shadow",
+    "CLOUD_STRATEGY": "shadow",
     "DEVICE_ID": "smart-meter-device-id",
     "LOCAL_KEY": "local-key",
     "IP_ADDRESS": "10.0.0.20",
diff --git a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json
index 5033faa4b5..c7a8f5cf08 100644
--- a/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-meter-bbcg1hrkrj5rifsd/poll-device.json
@@ -6,7 +6,7 @@
     { "name": "LOCAL_KEY", "value": "local-key" },
     { "name": "IP_ADDRESS", "value": "10.0.0.20" },
     { "name": "CLOUD_IP", "value": "82.0.0.10" },
-    { "name": "CLOUD_READ_STRATEGY", "value": "shadow" },
+    { "name": "CLOUD_STRATEGY", "value": "shadow" },
     { "name": "LOCAL_OVERRIDE", "value": true },
     { "name": "PROTOCOL_VERSION", "value": "3.3" },
     { "name": "PRODUCT_ID", "value": "bbcg1hrkrj5rifsd" }
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
index b0627a4ec7..be5ee26f09 100644
--- a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
@@ -9,6 +9,7 @@
   "poll_frequency": 10000,
   "should_poll": true,
   "params": {
+    "CLOUD_STRATEGY": "legacy",
     "DEVICE_ID": "bf2be3c32ea4d8f561ujmu",
     "LOCAL_KEY": "local-key",
     "IP_ADDRESS": "192.168.1.50",
@@ -43,7 +44,7 @@
       "category": "switch",
       "type": "binary",
       "read_only": false,
-      "has_feedback": false,
+      "has_feedback": true,
       "min": 0,
       "max": 1
     },
@@ -54,7 +55,7 @@
       "category": "child-lock",
       "type": "binary",
       "read_only": false,
-      "has_feedback": false,
+      "has_feedback": true,
       "min": 0,
       "max": 1
     },
diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json
index 8a78973348..127851957d 100644
--- a/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-basic/expected-device.json
@@ -10,7 +10,7 @@
   "poll_frequency": 10000,
   "should_poll": true,
   "params": {
-    "CLOUD_READ_STRATEGY": "legacy",
+    "CLOUD_STRATEGY": "legacy",
     "DEVICE_ID": "socket-device-id",
     "LOCAL_KEY": "local-key",
     "IP_ADDRESS": "10.0.0.10",
@@ -46,7 +46,7 @@
       "category": "switch",
       "type": "binary",
       "read_only": false,
-      "has_feedback": false,
+      "has_feedback": true,
       "min": 0,
       "max": 1
     },
diff --git a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
index 7ba5a2593d..410ba41f7e 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.convertFeature.test.js
@@ -23,7 +23,7 @@ describe('Tuya convert feature', () => {
     expect(result).to.deep.eq({
       category: 'switch',
       external_id: 'externalId:switch_1',
-      has_feedback: false,
+      has_feedback: true,
       max: 1000,
       min: 100,
       name: 'switch_1',
@@ -47,7 +47,7 @@ describe('Tuya convert feature', () => {
     expect(result).to.deep.eq({
       category: 'switch',
       external_id: 'externalId:switch_1',
-      has_feedback: false,
+      has_feedback: true,
       max: 1,
       min: 0,
       name: 'switch_1',
@@ -90,7 +90,7 @@ describe('Tuya convert feature', () => {
     expect(result).to.deep.eq({
       category: 'switch',
       external_id: 'externalId:switch_1',
-      has_feedback: false,
+      has_feedback: true,
       max: 8,
       min: 2,
       name: 'switch_1',
diff --git a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
index 37d9d8199a..e89be73659 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
@@ -1,5 +1,11 @@
 const { expect } = require('chai');
-const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES, COVER_STATE } = require('../../../../../../utils/constants');
+const {
+  DEVICE_FEATURE_CATEGORIES,
+  DEVICE_FEATURE_TYPES,
+  COVER_STATE,
+  OPENING_SENSOR_STATE,
+  PILOT_WIRE_MODE,
+} = require('../../../../../../utils/constants');
 const { writeValues, readValues } = require('../../../../../../services/tuya/lib/device/tuya.deviceMapping');
 
 describe('Tuya device mapping', () => {
@@ -28,6 +34,20 @@ describe('Tuya device mapping', () => {
       const result = writeValues[DEVICE_FEATURE_CATEGORIES.CHILD_LOCK][DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY](1);
       expect(result).to.eq(true);
     });
+    it('thermostat target temperature', () => {
+      const result = writeValues[DEVICE_FEATURE_CATEGORIES.THERMOSTAT][
+        DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE
+      ]('21.5', {
+        scale: 1,
+      });
+      expect(result).to.eq(215);
+    });
+    it('heater pilot wire mode', () => {
+      const result = writeValues[DEVICE_FEATURE_CATEGORIES.HEATER][DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE](
+        PILOT_WIRE_MODE.PROGRAMMING,
+      );
+      expect(result).to.eq('Programming');
+    });
     describe('curtain state', () => {
       it('open', () => {
         const result = writeValues[DEVICE_FEATURE_CATEGORIES.CURTAIN][DEVICE_FEATURE_TYPES.CURTAIN.STATE](
@@ -98,6 +118,23 @@ describe('Tuya device mapping', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.CHILD_LOCK][DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY]('true');
         expect(result).to.eq(1);
       });
+      it('thermostat target temperature with explicit scale', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.THERMOSTAT][
+          DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE
+        ]('210', {
+          scale: 1,
+        });
+        expect(result).to.eq(21);
+      });
+      it('temperature sensor decimal with explicit scale', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR][DEVICE_FEATURE_TYPES.SENSOR.DECIMAL](
+          '152',
+          {
+            scale: 1,
+          },
+        );
+        expect(result).to.eq(15.2);
+      });
       it('energy', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.SWITCH][DEVICE_FEATURE_TYPES.SWITCH.ENERGY]('30');
         expect(result).to.eq(0.3);
@@ -162,6 +199,12 @@ describe('Tuya device mapping', () => {
         ]('149241', { scale: 2 });
         expect(result).to.eq(1492.41);
       });
+      it('index today with scale', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][
+          DEVICE_FEATURE_TYPES.ENERGY_SENSOR.INDEX_TODAY
+        ]('149241', { scale: 2 });
+        expect(result).to.eq(1492.41);
+      });
       it('voltage with scale', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR][
           DEVICE_FEATURE_TYPES.ENERGY_SENSOR.VOLTAGE
@@ -181,6 +224,36 @@ describe('Tuya device mapping', () => {
         expect(result).to.eq(432.22);
       });
     });
+    describe('opening sensor', () => {
+      it('maps true to open', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.OPENING_SENSOR][DEVICE_FEATURE_TYPES.SENSOR.BINARY](true);
+        expect(result).to.eq(OPENING_SENSOR_STATE.OPEN);
+      });
+      it('maps false to close', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.OPENING_SENSOR][DEVICE_FEATURE_TYPES.SENSOR.BINARY](false);
+        expect(result).to.eq(OPENING_SENSOR_STATE.CLOSE);
+      });
+    });
+    describe('heater pilot wire mode', () => {
+      it('maps programming mode', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.HEATER][DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE](
+          'Programming',
+        );
+        expect(result).to.eq(PILOT_WIRE_MODE.PROGRAMMING);
+      });
+      it('maps thermostat mode', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.HEATER][DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE](
+          'Thermostat',
+        );
+        expect(result).to.eq(PILOT_WIRE_MODE.THERMOSTAT);
+      });
+      it('returns null for unknown mode', () => {
+        const result = readValues[DEVICE_FEATURE_CATEGORIES.HEATER][DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE](
+          'Boost',
+        );
+        expect(result).to.eq(null);
+      });
+    });
     describe('curtain state', () => {
       it('open', () => {
         const result = readValues[DEVICE_FEATURE_CATEGORIES.CURTAIN][DEVICE_FEATURE_TYPES.CURTAIN.STATE]('open');
diff --git a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
index cce2cca00f..4f6c4b0672 100644
--- a/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
+++ b/server/test/services/tuya/lib/device/tuya.convertDevice.test.js
@@ -60,7 +60,7 @@ describe('tuya.convertDevice', () => {
     expect(params[DEVICE_PARAM_NAME.LOCAL_OVERRIDE]).to.equal(true);
     expect(params[DEVICE_PARAM_NAME.PRODUCT_ID]).to.equal('product-id');
     expect(params[DEVICE_PARAM_NAME.PRODUCT_KEY]).to.equal('product-key');
-    expect(params[DEVICE_PARAM_NAME.CLOUD_READ_STRATEGY]).to.equal('legacy');
+    expect(params[DEVICE_PARAM_NAME.CLOUD_STRATEGY]).to.equal('legacy');
   });
 
   it('should handle missing optional fields', () => {
@@ -126,7 +126,7 @@ describe('tuya.convertDevice', () => {
       acc[param.name] = param.value;
       return acc;
     }, {});
-    expect(params[DEVICE_PARAM_NAME.CLOUD_READ_STRATEGY]).to.equal('shadow');
+    expect(params[DEVICE_PARAM_NAME.CLOUD_STRATEGY]).to.equal('shadow');
   });
 
   it('should keep specification group when thing model exposes the same code', () => {
diff --git a/server/test/services/tuya/lib/device/tuya.localMapping.test.js b/server/test/services/tuya/lib/device/tuya.localMapping.test.js
index d23c64b49a..471c75d709 100644
--- a/server/test/services/tuya/lib/device/tuya.localMapping.test.js
+++ b/server/test/services/tuya/lib/device/tuya.localMapping.test.js
@@ -111,4 +111,17 @@ describe('Tuya local mapping', () => {
     const dpsKey = getLocalDpsFromCode('total_power', device);
     expect(dpsKey).to.equal(115);
   });
+
+  it('should resolve pilot thermostat dps in strict local mapping', () => {
+    const device = { device_type: 'pilot-thermostat' };
+
+    expect(getLocalDpsFromCode('mode', device)).to.equal(101);
+    expect(getLocalDpsFromCode('child_lock', device)).to.equal(102);
+    expect(getLocalDpsFromCode('electricity_statistics', device)).to.equal(112);
+    expect(getLocalDpsFromCode('temp_current', device)).to.equal(116);
+    expect(getLocalDpsFromCode('average_power', device)).to.equal(117);
+    expect(getLocalDpsFromCode('window_state', device)).to.equal(123);
+    expect(getLocalDpsFromCode('temp_set', device)).to.equal(125);
+    expect(getLocalDpsFromCode('running_mode', device)).to.equal(131);
+  });
 });
diff --git a/server/test/services/tuya/lib/tuya.discoverDevices.test.js b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
index 4dd6232087..b5b3065ab6 100644
--- a/server/test/services/tuya/lib/tuya.discoverDevices.test.js
+++ b/server/test/services/tuya/lib/tuya.discoverDevices.test.js
@@ -163,7 +163,7 @@ describe('TuyaHandler.discoverDevices', () => {
         {
           category: 'switch',
           external_id: 'tuya:uuid:switch_1',
-          has_feedback: false,
+          has_feedback: true,
           max: 1,
           min: 0,
           name: 'switch_1',
@@ -194,7 +194,7 @@ describe('TuyaHandler.discoverDevices', () => {
           value: false,
         },
         {
-          name: 'CLOUD_READ_STRATEGY',
+          name: 'CLOUD_STRATEGY',
           value: 'legacy',
         },
       ],
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index 1c2da12812..7b4211191d 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -11,8 +11,13 @@ const connect = proxyquire('../../../../services/tuya/lib/tuya.connect', {
 const TuyaHandler = proxyquire('../../../../services/tuya/lib/index', {
   './tuya.connect.js': connect,
 });
-const { EVENTS } = require('../../../../utils/constants');
-const { API } = require('../../../../services/tuya/lib/utils/tuya.constants');
+const {
+  EVENTS,
+  DEVICE_FEATURE_CATEGORIES,
+  DEVICE_FEATURE_TYPES,
+  DEVICE_FEATURE_UNITS,
+} = require('../../../../utils/constants');
+const { API, DEVICE_PARAM_NAME } = require('../../../../services/tuya/lib/utils/tuya.constants');
 
 const { BadParameters } = require('../../../../utils/coreErrors');
 
@@ -112,7 +117,7 @@ describe('TuyaHandler.poll', () => {
     assert.callCount(gladys.event.emit, 0);
   });
   it('should skip cloud feature when code is missing from payload', async () => {
-    await tuyaHandler.poll({
+    await tuyaHandler.poll.call(tuyaHandler, {
       external_id: 'tuya:device',
       features: [
         {
@@ -180,7 +185,7 @@ describe('TuyaHandler.poll', () => {
 
     await tuyaHandler.poll({
       external_id: 'tuya:device',
-      params: [{ name: 'CLOUD_READ_STRATEGY', value: 'shadow' }],
+      params: [{ name: 'CLOUD_STRATEGY', value: 'shadow' }],
       features: [
         {
           external_id: 'tuya:device:power_a',
@@ -360,6 +365,237 @@ describe('TuyaHandler.poll with local mapping', () => {
     expect(emit.secondCall.args[1].state).to.equal(0);
   });
 
+  it('should convert thermostat temperatures from local dps unit and persist reported unit', async () => {
+    const localPoll = sinon.stub().resolves({ dps: { 116: 680, 125: 720, 126: 'f' } });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+    });
+
+    const emit = sinon.stub();
+    const setParam = sinon.stub().resolves();
+
+    await poll.call(
+      {
+        connector: { request: sinon.stub() },
+        gladys: {
+          event: { emit },
+        },
+      },
+      {
+        id: 'device-id',
+        external_id: 'tuya:device',
+        device_type: 'pilot-thermostat',
+        properties: {
+          properties: [{ code: 'temp_unit_convert', dp_id: 126, value: 'c' }],
+        },
+        params: [
+          { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '1.1.1.1' },
+          { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+          { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.5' },
+          { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+        ],
+        features: [
+          {
+            external_id: 'tuya:device:temp_current',
+            category: DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR,
+            type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
+            unit: DEVICE_FEATURE_UNITS.CELSIUS,
+            scale: 1,
+            min: 0,
+            max: 50,
+          },
+          {
+            external_id: 'tuya:device:temp_set',
+            category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
+            type: DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
+            unit: DEVICE_FEATURE_UNITS.CELSIUS,
+            scale: 1,
+          },
+        ],
+      },
+    );
+
+    expect(setParam.called).to.equal(false);
+    expect(emit.calledTwice).to.equal(true);
+    expect(emit.firstCall.args[1]).to.deep.equal({
+      device_feature_external_id: 'tuya:device:temp_current',
+      state: 20,
+    });
+    expect(emit.secondCall.args[1]).to.deep.equal({
+      device_feature_external_id: 'tuya:device:temp_set',
+      state: 22,
+    });
+  });
+
+  it('should convert cloud thermostat temperatures from reported unit', async () => {
+    const request = sinon.stub().resolves({
+      result: [
+        { code: 'temp_unit_convert', value: 'f' },
+        { code: 'temp_current', value: 680 },
+      ],
+    });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {});
+    const emit = sinon.stub();
+    const setParam = sinon.stub().resolves();
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: {
+          event: { emit },
+        },
+      },
+      {
+        id: 'device-id',
+        external_id: 'tuya:device',
+        properties: {
+          properties: [{ code: 'temp_unit_convert', value: 'c' }],
+        },
+        features: [
+          {
+            external_id: 'tuya:device:temp_current',
+            category: DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR,
+            type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
+            unit: DEVICE_FEATURE_UNITS.CELSIUS,
+            scale: 1,
+            min: 0,
+            max: 50,
+          },
+        ],
+      },
+    );
+
+    expect(request.calledOnce).to.equal(true);
+    expect(setParam.called).to.equal(false);
+    expect(emit.calledOnce).to.equal(true);
+    expect(emit.firstCall.args[1]).to.deep.equal({
+      device_feature_external_id: 'tuya:device:temp_current',
+      state: 20,
+    });
+  });
+
+  it('should read cloud values from thing shadow when strategy is shadow', async () => {
+    const request = sinon.stub().resolves({
+      result: {
+        properties: [
+          { code: 'temp_unit_convert', value: 'f' },
+          { code: 'temp_current', value: 680 },
+        ],
+      },
+    });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {});
+    const emit = sinon.stub();
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: {
+          event: { emit },
+        },
+      },
+      {
+        id: 'device-id',
+        external_id: 'tuya:device',
+        params: [{ name: DEVICE_PARAM_NAME.CLOUD_STRATEGY, value: 'shadow' }],
+        properties: {
+          properties: [{ code: 'temp_unit_convert', value: 'c' }],
+        },
+        features: [
+          {
+            external_id: 'tuya:device:temp_current',
+            category: DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR,
+            type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
+            unit: DEVICE_FEATURE_UNITS.CELSIUS,
+            scale: 1,
+            min: 0,
+            max: 50,
+          },
+        ],
+      },
+    );
+
+    expect(request.calledOnce).to.equal(true);
+    expect(request.firstCall.args[0]).to.deep.equal({
+      method: 'GET',
+      path: `${API.VERSION_2_0}/thing/device/shadow/properties`,
+    });
+    expect(emit.calledOnce).to.equal(true);
+    expect(emit.firstCall.args[1]).to.deep.equal({
+      device_feature_external_id: 'tuya:device:temp_current',
+      state: 20,
+    });
+  });
+
+  it('should fallback to mapping scale for thermostat and power features when stored feature scale is missing', async () => {
+    const localPoll = sinon.stub().resolves({ dps: { 116: 169, 117: 30, 125: 200, 126: 'c' } });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+    });
+
+    const emit = sinon.stub();
+
+    await poll.call(
+      {
+        connector: { request: sinon.stub() },
+        gladys: {
+          event: { emit },
+        },
+      },
+      {
+        id: 'device-id',
+        external_id: 'tuya:device',
+        device_type: 'pilot-thermostat',
+        properties: {
+          properties: [{ code: 'temp_unit_convert', dp_id: 126, value: 'c' }],
+        },
+        params: [
+          { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '1.1.1.1' },
+          { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+          { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.5' },
+          { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+        ],
+        features: [
+          {
+            external_id: 'tuya:device:temp_current',
+            category: DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR,
+            type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
+            unit: DEVICE_FEATURE_UNITS.CELSIUS,
+            min: -30,
+            max: 90,
+          },
+          {
+            external_id: 'tuya:device:average_power',
+            category: DEVICE_FEATURE_CATEGORIES.ENERGY_SENSOR,
+            type: DEVICE_FEATURE_TYPES.ENERGY_SENSOR.POWER,
+            unit: DEVICE_FEATURE_UNITS.WATT,
+          },
+          {
+            external_id: 'tuya:device:temp_set',
+            category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
+            type: DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
+            unit: DEVICE_FEATURE_UNITS.CELSIUS,
+            min: 5,
+            max: 30,
+          },
+        ],
+      },
+    );
+
+    expect(emit.callCount).to.equal(3);
+    expect(emit.getCall(0).args[1]).to.deep.equal({
+      device_feature_external_id: 'tuya:device:temp_current',
+      state: 16.9,
+    });
+    expect(emit.getCall(1).args[1]).to.deep.equal({
+      device_feature_external_id: 'tuya:device:average_power',
+      state: 3,
+    });
+    expect(emit.getCall(2).args[1]).to.deep.equal({
+      device_feature_external_id: 'tuya:device:temp_set',
+      state: 20,
+    });
+  });
+
   it('should emit same cloud value only after heartbeat interval', async () => {
     const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {});
 
diff --git a/server/test/services/tuya/lib/tuya.setValue.test.js b/server/test/services/tuya/lib/tuya.setValue.test.js
index cbc61cbc5a..26dbcd05cb 100644
--- a/server/test/services/tuya/lib/tuya.setValue.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.test.js
@@ -9,7 +9,11 @@ const { assert, fake } = sinon;
 const { expect } = require('chai');
 const TuyaHandler = require('../../../../services/tuya/lib/index');
 const { API, DEVICE_PARAM_NAME } = require('../../../../services/tuya/lib/utils/tuya.constants');
-const { DEVICE_FEATURE_CATEGORIES, DEVICE_FEATURE_TYPES } = require('../../../../utils/constants');
+const {
+  DEVICE_FEATURE_CATEGORIES,
+  DEVICE_FEATURE_TYPES,
+  DEVICE_FEATURE_UNITS,
+} = require('../../../../utils/constants');
 const { BadParameters } = require('../../../../utils/coreErrors');
 
 const gladys = {
@@ -76,7 +80,11 @@ describe('TuyaHandler.setValue', () => {
 
   it('should call tuya api', async () => {
     await tuyaHandler.setValue(
-      {},
+      {
+        specifications: {
+          functions: [{ code: 'switch_0' }],
+        },
+      },
       {
         external_id: 'tuya:uuid:switch_0',
         category: DEVICE_FEATURE_CATEGORIES.SWITCH,
@@ -244,6 +252,9 @@ describe('TuyaHandler.setValue', () => {
         { name: DEVICE_PARAM_NAME.CLOUD_IP, value: '10.0.0.2' },
         { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: 'false' },
       ],
+      specifications: {
+        functions: [{ code: 'switch_1' }],
+      },
     };
     const deviceFeature = {
       external_id: 'tuya:device:switch_1',
@@ -262,6 +273,100 @@ describe('TuyaHandler.setValue', () => {
     expect(ctx.connector.request.calledOnce).to.equal(true);
   });
 
+  it('should convert thermostat target temperature to device unit before sending', async () => {
+    const device = {
+      params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: false }],
+      properties: {
+        properties: [{ code: 'temp_unit_convert', value: 'f' }],
+      },
+      specifications: {
+        functions: [{ code: 'temp_set' }],
+      },
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:temp_set',
+      category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
+      type: DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
+      unit: DEVICE_FEATURE_UNITS.CELSIUS,
+      scale: 1,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub().resolves({ success: true }) },
+      gladys: {},
+    };
+
+    await tuyaHandler.setValue.call(ctx, device, deviceFeature, 20);
+
+    expect(ctx.connector.request.calledOnce).to.equal(true);
+    expect(ctx.connector.request.firstCall.args[0]).to.deep.equal({
+      method: 'POST',
+      path: `${API.VERSION_1_0}/devices/device/commands`,
+      body: { commands: [{ code: 'temp_set', value: 680 }] },
+    });
+  });
+
+  it('should fallback to mapping scale for thermostat target temperature when feature scale is missing', async () => {
+    const device = {
+      device_type: 'pilot-thermostat',
+      params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: false }],
+      properties: {
+        properties: [{ code: 'temp_unit_convert', value: 'c' }],
+      },
+      specifications: {
+        functions: [{ code: 'temp_set' }],
+      },
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:temp_set',
+      category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
+      type: DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
+      unit: DEVICE_FEATURE_UNITS.CELSIUS,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub().resolves({ success: true }) },
+      gladys: {},
+    };
+
+    await tuyaHandler.setValue.call(ctx, device, deviceFeature, 20);
+
+    expect(ctx.connector.request.calledOnce).to.equal(true);
+    expect(ctx.connector.request.firstCall.args[0]).to.deep.equal({
+      method: 'POST',
+      path: `${API.VERSION_1_0}/devices/device/commands`,
+      body: { commands: [{ code: 'temp_set', value: 200 }] },
+    });
+  });
+
+  it('should write through thing shadow when strategy is shadow', async () => {
+    const device = {
+      params: [
+        { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: false },
+        { name: DEVICE_PARAM_NAME.CLOUD_STRATEGY, value: 'shadow' },
+      ],
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:child_lock',
+      category: DEVICE_FEATURE_CATEGORIES.CHILD_LOCK,
+      type: DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub().resolves({ success: true }) },
+      gladys: {},
+    };
+
+    await tuyaHandler.setValue.call(ctx, device, deviceFeature, 1);
+
+    expect(ctx.connector.request.calledOnce).to.equal(true);
+    expect(ctx.connector.request.firstCall.args[0]).to.deep.equal({
+      method: 'POST',
+      path: `${API.VERSION_2_0}/thing/device/shadow/properties/issue`,
+      body: { properties: JSON.stringify({ child_lock: true }) },
+    });
+  });
+
   it('should fallback to cloud when dps is not mapped', async () => {
     const connect = sinon.stub().resolves();
     const set = sinon.stub().resolves();
@@ -284,6 +389,9 @@ describe('TuyaHandler.setValue', () => {
         { name: DEVICE_PARAM_NAME.CLOUD_IP, value: '1.1.1.1' },
         { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
       ],
+      specifications: {
+        functions: [{ code: 'countdown' }],
+      },
     };
     const deviceFeature = {
       external_id: 'tuya:device:countdown',
@@ -324,6 +432,9 @@ describe('TuyaHandler.setValue', () => {
         { name: DEVICE_PARAM_NAME.CLOUD_IP, value: '1.1.1.1' },
         { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
       ],
+      specifications: {
+        functions: [{ code: 'switch_1' }],
+      },
     };
     const deviceFeature = {
       external_id: 'tuya:device:switch_1',
@@ -370,6 +481,93 @@ describe('TuyaHandler.setValue', () => {
     expect(ctx.connector.request.called).to.equal(false);
   });
 
+  it('should throw when cloud command is rejected', async () => {
+    const device = {
+      params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: false }],
+      specifications: {
+        functions: [{ code: 'child_lock' }],
+      },
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:child_lock',
+      category: DEVICE_FEATURE_CATEGORIES.CHILD_LOCK,
+      type: DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY,
+    };
+
+    const ctx = {
+      connector: {
+        request: sinon.stub().resolves({ success: false, msg: 'command or value not support' }),
+      },
+      gladys: {},
+    };
+
+    try {
+      await tuyaHandler.setValue.call(ctx, device, deviceFeature, 1);
+      expect.fail('Expected setValue to throw');
+    } catch (error) {
+      expect(error.message).to.include('command or value not support');
+    }
+  });
+
+  it('should poll feedback when cloud command is rejected', async () => {
+    const device = {
+      external_id: 'tuya:device',
+      params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: false }],
+      specifications: {
+        functions: [{ code: 'child_lock' }],
+      },
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:child_lock',
+      category: DEVICE_FEATURE_CATEGORIES.CHILD_LOCK,
+      type: DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY,
+    };
+
+    const ctx = {
+      connector: {
+        request: sinon.stub().resolves({ success: false, msg: 'command or value not support' }),
+      },
+      gladys: {},
+      feedbackPollDelayMs: 0,
+      poll: sinon.stub().resolves(),
+    };
+
+    try {
+      await tuyaHandler.setValue.call(ctx, device, deviceFeature, 1);
+      expect.fail('Expected setValue to throw');
+    } catch (error) {
+      expect(error.message).to.include('command or value not support');
+    }
+
+    expect(ctx.poll.calledOnceWithExactly(device)).to.equal(true);
+  });
+
+  it('should reject when the selected cloud strategy command fails', async () => {
+    const device = {
+      params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: false }],
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:child_lock',
+      category: DEVICE_FEATURE_CATEGORIES.CHILD_LOCK,
+      type: DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY,
+    };
+
+    const ctx = {
+      connector: {
+        request: sinon.stub(),
+      },
+      gladys: {},
+    };
+
+    try {
+      await tuyaHandler.setValue.call(ctx, device, deviceFeature, 1);
+      expect.fail('Expected setValue to throw');
+    } catch (error) {
+      expect(error.message).to.include('command rejected');
+    }
+    expect(ctx.connector.request.calledOnce).to.equal(true);
+  });
+
   it('should log disconnect failures and still return on local success', async () => {
     const connect = sinon.stub().resolves();
     const set = sinon.stub().resolves();
diff --git a/server/utils/constants.js b/server/utils/constants.js
index 156195eb54..574e0f4f50 100644
--- a/server/utils/constants.js
+++ b/server/utils/constants.js
@@ -130,6 +130,8 @@ const PILOT_WIRE_MODE = {
   COMFORT_1: 3,
   COMFORT_2: 4,
   COMFORT: 5,
+  PROGRAMMING: 6,
+  THERMOSTAT: 7,
 };
 
 const MUSIC_PLAYBACK_STATE = {

From b6ce656b8683999b12219b9fb13fbb7832677636 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Tue, 3 Mar 2026 14:08:20 +0100
Subject: [PATCH 85/90] test(tuya): align LSC smart socket fixture cloud
 strategy

---
 .../devices/smart-socket-b61eihfqeaexn54g/expected-device.json   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
index be5ee26f09..a966689f48 100644
--- a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
@@ -14,6 +14,7 @@
     "LOCAL_KEY": "local-key",
     "IP_ADDRESS": "192.168.1.50",
     "CLOUD_IP": "91.0.0.1",
+    "CLOUD_READ_STRATEGY": "legacy",
     "LOCAL_OVERRIDE": true,
     "PROTOCOL_VERSION": "3.5",
     "PRODUCT_ID": "b61eihfqeaexn54g"

From bd0d9bae5a9f7d017b9aecdeb6e555222c3d88e4 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Tue, 3 Mar 2026 14:17:37 +0100
Subject: [PATCH 86/90] test(tuya): restore unified cloud strategy fixture on
 thermostat branch

---
 .../devices/smart-socket-b61eihfqeaexn54g/expected-device.json   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
index a966689f48..be5ee26f09 100644
--- a/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
+++ b/server/test/services/tuya/fixtures/devices/smart-socket-b61eihfqeaexn54g/expected-device.json
@@ -14,7 +14,6 @@
     "LOCAL_KEY": "local-key",
     "IP_ADDRESS": "192.168.1.50",
     "CLOUD_IP": "91.0.0.1",
-    "CLOUD_READ_STRATEGY": "legacy",
     "LOCAL_OVERRIDE": true,
     "PROTOCOL_VERSION": "3.5",
     "PRODUCT_ID": "b61eihfqeaexn54g"

From 340353a8fc155d7ae68ca43c046679b9e38621c5 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Tue, 3 Mar 2026 18:22:38 +0100
Subject: [PATCH 87/90] fix(tuya): handle unreachable local devices cleanly

---
 server/services/tuya/lib/tuya.localPoll.js    | 21 +++++++---
 .../services/tuya/lib/tuya.localPoll.test.js  | 40 +++++++++++++++++++
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/server/services/tuya/lib/tuya.localPoll.js b/server/services/tuya/lib/tuya.localPoll.js
index 4cab54e836..d169b92502 100644
--- a/server/services/tuya/lib/tuya.localPoll.js
+++ b/server/services/tuya/lib/tuya.localPoll.js
@@ -41,9 +41,22 @@ async function localPoll(payload) {
   }
   const tuyaLocal = new TuyaLocalApi(tuyaOptions);
   let lastError = null;
+  const formatSocketError = (err) => {
+    if (!err || !err.message) {
+      return 'Local poll socket error';
+    }
+    const networkErrorCodes = ['EHOSTUNREACH', 'EHOSTDOWN', 'ENETUNREACH', 'ECONNREFUSED', 'ETIMEDOUT'];
+    if (networkErrorCodes.includes(err.code)) {
+      return `Local device unreachable at ${ip}:6668 (${err.code}). Device may be offline, unplugged, or no longer connected to Wi-Fi.`;
+    }
+    if (typeof err.message === 'string' && err.message.includes('EHOSTUNREACH')) {
+      return `Local device unreachable at ${ip}:6668 (EHOSTUNREACH). Device may be offline, unplugged, or no longer connected to Wi-Fi.`;
+    }
+    return `Local poll socket error: ${err.message}`;
+  };
   const onError = (err) => {
     lastError = err;
-    logger.info(`[Tuya][localPoll] socket error for device=${deviceId}: ${err.message}`);
+    logger.info(`[Tuya][localPoll] socket error for device=${deviceId}: ${formatSocketError(err)}`);
   };
   tuyaLocal.on('error', onError);
 
@@ -81,7 +94,7 @@ async function localPoll(payload) {
         }),
         new Promise((_, reject) => {
           errorListener = (err) => {
-            reject(new BadParameters(`Local poll socket error: ${err.message}`));
+            reject(new BadParameters(formatSocketError(err)));
           };
           tuyaLocal.once('error', errorListener);
         }),
@@ -116,15 +129,13 @@ async function localPoll(payload) {
     if (logDps) {
       logger.debug(`[Tuya][localPoll] device=${deviceId} dps=${JSON.stringify(data)}`);
     }
-    tuyaLocal.removeListener('error', onError);
     return data;
   } catch (e) {
     if (lastError && (!e || e.message !== lastError.message)) {
-      logger.info(`[Tuya][localPoll] last socket error for device=${deviceId}: ${lastError.message}`);
+      logger.info(`[Tuya][localPoll] last socket error for device=${deviceId}: ${formatSocketError(lastError)}`);
     }
     logger.warn(`[Tuya][localPoll] failed for device=${deviceId}`, e);
     try {
-      tuyaLocal.removeListener('error', onError);
       await tuyaLocal.disconnect();
     } catch (err) {
       // ignore
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index c910e19dd6..476f6db2d1 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -264,6 +264,46 @@ describe('TuyaHandler.localPoll', () => {
     throw new Error('Expected error');
   });
 
+  it('should normalize unreachable local device socket errors', async () => {
+    const connect = sinon.stub().resolves();
+    const get = sinon.stub().returns(new Promise(() => {}));
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.get = get;
+      this.disconnect = disconnect;
+      this.on = sinon.stub();
+      this.once = sinon.stub().callsFake((event, cb) => {
+        if (event === 'error') {
+          const error = new Error('Error from socket: connect EHOSTUNREACH 10.1.0.53:6668');
+          error.code = 'EHOSTUNREACH';
+          cb(error);
+        }
+      });
+      this.removeListener = sinon.stub();
+    }
+    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+      tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
+    });
+
+    try {
+      await localPoll({
+        deviceId: 'device',
+        ip: '10.1.0.53',
+        localKey: 'key',
+        protocolVersion: '3.3',
+      });
+    } catch (e) {
+      expect(e).to.be.instanceOf(BadParameters);
+      expect(e.message).to.equal(
+        'Local device unreachable at 10.1.0.53:6668 (EHOSTUNREACH). Device may be offline, unplugged, or no longer connected to Wi-Fi.',
+      );
+      return;
+    }
+    throw new Error('Expected error');
+  });
+
   it('should keep the original connect error when a socket error also occurs', async () => {
     const connect = sinon.stub().rejects(new Error('connect failed'));
     const get = sinon.stub();

From df476d3e2c2993ae0367fcbfd6179c5688078a02 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Tue, 3 Mar 2026 19:18:59 +0100
Subject: [PATCH 88/90] test(tuya): improve thermostat branch coverage

---
 server/services/tuya/lib/tuya.poll.js         |  39 +--
 .../device/feature/tuya.deviceMapping.test.js |   8 +
 .../test/services/tuya/lib/tuya.poll.test.js  | 278 ++++++++++++++++++
 .../services/tuya/lib/tuya.setValue.test.js   | 169 +++++++++++
 .../tuya/lib/utils/tuya.cloudStrategy.test.js |  41 +++
 .../tuya/lib/utils/tuya.normalize.test.js     |  18 ++
 .../tuya/lib/utils/tuya.report.test.js        |  50 ++++
 7 files changed, 575 insertions(+), 28 deletions(-)
 create mode 100644 server/test/services/tuya/lib/utils/tuya.cloudStrategy.test.js
 create mode 100644 server/test/services/tuya/lib/utils/tuya.normalize.test.js
 create mode 100644 server/test/services/tuya/lib/utils/tuya.report.test.js

diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index fd126a5479..96e6af1cec 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -139,43 +139,29 @@ const emitFeatureState = (gladys, deviceFeature, transformedValue, previousValue
 };
 
 const isTemperatureFeature = (deviceFeature, code) => {
-  if (!deviceFeature || !code) {
-    return false;
-  }
-  if (deviceFeature.unit !== DEVICE_FEATURE_UNITS.CELSIUS && deviceFeature.unit !== DEVICE_FEATURE_UNITS.FAHRENHEIT) {
-    return false;
-  }
-  return code === 'temp_set' || code === 'temp_current';
+  return Boolean(
+    deviceFeature &&
+      (deviceFeature.unit === DEVICE_FEATURE_UNITS.CELSIUS || deviceFeature.unit === DEVICE_FEATURE_UNITS.FAHRENHEIT) &&
+      (code === 'temp_set' || code === 'temp_current'),
+  );
 };
 
 const roundTemperatureValue = (value, code) => {
-  if (!Number.isFinite(value)) {
-    return value;
-  }
   if (code === 'temp_set') {
     return Math.round(value);
   }
-  if (code === 'temp_current') {
-    return Math.round(value * 10) / 10;
-  }
-  return value;
+  return Math.round(value * 10) / 10;
 };
 
 const convertTemperatureValue = (value, fromUnit, toUnit, deviceFeature, code) => {
-  if (value === null || value === undefined) {
-    return value;
-  }
   const numericValue = Number(value);
   if (!Number.isFinite(numericValue) || !fromUnit || !toUnit || fromUnit === toUnit) {
     return value;
   }
-  let convertedValue = numericValue;
-  if (fromUnit === DEVICE_FEATURE_UNITS.CELSIUS && toUnit === DEVICE_FEATURE_UNITS.FAHRENHEIT) {
-    convertedValue = celsiusToFahrenheit(numericValue);
-  }
-  if (fromUnit === DEVICE_FEATURE_UNITS.FAHRENHEIT && toUnit === DEVICE_FEATURE_UNITS.CELSIUS) {
-    convertedValue = fahrenheitToCelsius(numericValue);
-  }
+  const convertedValue =
+    fromUnit === DEVICE_FEATURE_UNITS.CELSIUS
+      ? celsiusToFahrenheit(numericValue)
+      : fahrenheitToCelsius(numericValue);
   const roundedValue = roundTemperatureValue(convertedValue, code);
   if (code === 'temp_current' && deviceFeature) {
     const min = Number(deviceFeature.min);
@@ -209,10 +195,7 @@ const getTemperatureUnitFromLocalDps = (device, dps) => {
 };
 
 const getTemperatureUnitFromValues = (values) => {
-  if (!values) {
-    return null;
-  }
-  return normalizeTemperatureUnit(values.temp_unit_convert || values.unit);
+  return normalizeTemperatureUnit(values && (values.temp_unit_convert || values.unit));
 };
 
 const extractValuesFromResultArray = (device, result) => {
diff --git a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
index e89be73659..577f2e430b 100644
--- a/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
+++ b/server/test/services/tuya/lib/device/feature/tuya.deviceMapping.test.js
@@ -42,6 +42,14 @@ describe('Tuya device mapping', () => {
       });
       expect(result).to.eq(215);
     });
+    it('thermostat target temperature invalid value returns NaN', () => {
+      const result = writeValues[DEVICE_FEATURE_CATEGORIES.THERMOSTAT][
+        DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE
+      ]('not-a-number', {
+        scale: 1,
+      });
+      expect(Number.isNaN(result)).to.equal(true);
+    });
     it('heater pilot wire mode', () => {
       const result = writeValues[DEVICE_FEATURE_CATEGORIES.HEATER][DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE](
         PILOT_WIRE_MODE.PROGRAMMING,
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index 7b4211191d..4395c00f4f 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -208,6 +208,26 @@ describe('TuyaHandler.poll', () => {
     });
   });
 
+  it('should skip cloud feature when code is present but reader is missing', async () => {
+    tuyaHandler.connector.request = sinon.stub().resolves({
+      result: [{ code: 'temp_set', value: 210 }],
+    });
+
+    await tuyaHandler.poll({
+      external_id: 'tuya:device',
+      features: [
+        {
+          external_id: 'tuya:device:temp_set',
+          category: 'unknown-category',
+          type: 'unknown-type',
+        },
+      ],
+    });
+
+    assert.callCount(tuyaHandler.connector.request, 1);
+    assert.callCount(gladys.event.emit, 0);
+  });
+
   it('should return without cloud request when feature list is empty', async () => {
     await tuyaHandler.poll({
       external_id: 'tuya:device',
@@ -427,6 +447,129 @@ describe('TuyaHandler.poll with local mapping', () => {
     });
   });
 
+  it('should keep raw current temperature when converted value falls outside feature range', async () => {
+    const localPoll = sinon.stub().resolves({ dps: { 116: 158, 126: 'f' } });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+    });
+
+    const emit = sinon.stub();
+
+    await poll.call(
+      {
+        connector: { request: sinon.stub() },
+        gladys: {
+          event: { emit },
+        },
+      },
+      {
+        external_id: 'tuya:device',
+        device_type: 'pilot-thermostat',
+        properties: {
+          properties: [{ code: 'temp_unit_convert', dp_id: 126, value: 'f' }],
+        },
+        params: [
+          { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '1.1.1.1' },
+          { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+          { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.5' },
+          { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+        ],
+        features: [
+          {
+            external_id: 'tuya:device:temp_current',
+            category: DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR,
+            type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
+            unit: DEVICE_FEATURE_UNITS.CELSIUS,
+            scale: 1,
+            min: 0,
+            max: 50,
+          },
+        ],
+      },
+    );
+
+    expect(emit.calledOnce).to.equal(true);
+    expect(emit.firstCall.args[1]).to.deep.equal({
+      device_feature_external_id: 'tuya:device:temp_current',
+      state: 15.8,
+    });
+  });
+
+  it('should fallback to cloud when local value exists but reader is missing', async () => {
+    const localPoll = sinon.stub().resolves({ dps: { 125: 210 } });
+    const request = sinon.stub().resolves({ result: [{ code: 'temp_set', value: 210 }] });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+    });
+
+    const emit = sinon.stub();
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: {
+          event: { emit },
+        },
+      },
+      {
+        external_id: 'tuya:device',
+        device_type: 'pilot-thermostat',
+        params: [
+          { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '1.1.1.1' },
+          { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+          { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.5' },
+          { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+        ],
+        features: [
+          {
+            external_id: 'tuya:device:temp_set',
+            category: 'unknown-category',
+            type: 'unknown-type',
+          },
+        ],
+      },
+    );
+
+    expect(localPoll.calledOnce).to.equal(true);
+    expect(request.calledOnce).to.equal(true);
+    expect(emit.called).to.equal(false);
+  });
+
+  it('should skip cloud feature when transform loses the reader', async () => {
+    const request = sinon.stub().resolves({
+      result: [{ code: 'temp_set', value: 210 }],
+    });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {});
+    const emit = sinon.stub();
+
+    let categoryAccessCount = 0;
+    const feature = {
+      external_id: 'tuya:device:temp_set',
+      get category() {
+        categoryAccessCount += 1;
+        return categoryAccessCount === 1 ? DEVICE_FEATURE_CATEGORIES.THERMOSTAT : null;
+      },
+      type: DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
+      unit: DEVICE_FEATURE_UNITS.CELSIUS,
+    };
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: {
+          event: { emit },
+        },
+      },
+      {
+        external_id: 'tuya:device',
+        features: [feature],
+      },
+    );
+
+    expect(request.calledOnce).to.equal(true);
+    expect(emit.called).to.equal(false);
+  });
+
   it('should convert cloud thermostat temperatures from reported unit', async () => {
     const request = sinon.stub().resolves({
       result: [
@@ -474,6 +617,49 @@ describe('TuyaHandler.poll with local mapping', () => {
     });
   });
 
+  it('should convert cloud thermostat temperatures from celsius to fahrenheit when feature unit is fahrenheit', async () => {
+    const request = sinon.stub().resolves({
+      result: [
+        { code: 'temp_unit_convert', value: 'c' },
+        { code: 'temp_current', value: 20 },
+      ],
+    });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {});
+    const emit = sinon.stub();
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: {
+          event: { emit },
+        },
+      },
+      {
+        external_id: 'tuya:device',
+        properties: {
+          properties: [{ code: 'temp_unit_convert', value: 'c' }],
+        },
+        features: [
+          {
+            external_id: 'tuya:device:temp_current',
+            category: DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR,
+            type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
+            unit: DEVICE_FEATURE_UNITS.FAHRENHEIT,
+            min: 0,
+            max: 212,
+          },
+        ],
+      },
+    );
+
+    expect(request.calledOnce).to.equal(true);
+    expect(emit.calledOnce).to.equal(true);
+    expect(emit.firstCall.args[1]).to.deep.equal({
+      device_feature_external_id: 'tuya:device:temp_current',
+      state: 68,
+    });
+  });
+
   it('should read cloud values from thing shadow when strategy is shadow', async () => {
     const request = sinon.stub().resolves({
       result: {
@@ -526,6 +712,98 @@ describe('TuyaHandler.poll with local mapping', () => {
     });
   });
 
+  it('should fallback to cloud when local transform loses the reader', async () => {
+    const localPoll = sinon.stub().resolves({ dps: { 125: 210 } });
+    const request = sinon.stub().resolves({ result: [] });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+    });
+    const emit = sinon.stub();
+
+    let categoryAccessCount = 0;
+    const feature = {
+      external_id: 'tuya:device:temp_set',
+      get category() {
+        categoryAccessCount += 1;
+        return categoryAccessCount === 1 ? DEVICE_FEATURE_CATEGORIES.THERMOSTAT : null;
+      },
+      type: DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
+      unit: DEVICE_FEATURE_UNITS.CELSIUS,
+    };
+
+    await poll.call(
+      {
+        connector: { request },
+        gladys: {
+          event: { emit },
+        },
+      },
+      {
+        external_id: 'tuya:device',
+        device_type: 'pilot-thermostat',
+        params: [
+          { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '1.1.1.1' },
+          { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+          { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.5' },
+          { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+        ],
+        features: [feature],
+      },
+    );
+
+    expect(localPoll.calledOnce).to.equal(true);
+    expect(request.calledOnce).to.equal(true);
+    expect(emit.called).to.equal(false);
+  });
+
+  it('should keep existing temperature unit when local unit property has no dp_id', async () => {
+    const localPoll = sinon.stub().resolves({ dps: { 116: 158 } });
+    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
+      './tuya.localPoll': { localPoll },
+    });
+    const emit = sinon.stub();
+
+    await poll.call(
+      {
+        connector: { request: sinon.stub() },
+        gladys: {
+          event: { emit },
+        },
+      },
+      {
+        external_id: 'tuya:device',
+        device_type: 'pilot-thermostat',
+        properties: {
+          properties: [{ code: 'temp_unit_convert', value: 'f' }],
+        },
+        params: [
+          { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '1.1.1.1' },
+          { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
+          { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.5' },
+          { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
+        ],
+        features: [
+          {
+            external_id: 'tuya:device:temp_current',
+            category: DEVICE_FEATURE_CATEGORIES.TEMPERATURE_SENSOR,
+            type: DEVICE_FEATURE_TYPES.SENSOR.DECIMAL,
+            unit: DEVICE_FEATURE_UNITS.CELSIUS,
+            scale: 1,
+            min: 0,
+            max: 50,
+          },
+        ],
+      },
+    );
+
+    expect(localPoll.calledOnce).to.equal(true);
+    expect(emit.calledOnce).to.equal(true);
+    expect(emit.firstCall.args[1]).to.deep.equal({
+      device_feature_external_id: 'tuya:device:temp_current',
+      state: 15.8,
+    });
+  });
+
   it('should fallback to mapping scale for thermostat and power features when stored feature scale is missing', async () => {
     const localPoll = sinon.stub().resolves({ dps: { 116: 169, 117: 30, 125: 200, 126: 'c' } });
     const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
diff --git a/server/test/services/tuya/lib/tuya.setValue.test.js b/server/test/services/tuya/lib/tuya.setValue.test.js
index 26dbcd05cb..3be3157155 100644
--- a/server/test/services/tuya/lib/tuya.setValue.test.js
+++ b/server/test/services/tuya/lib/tuya.setValue.test.js
@@ -306,6 +306,103 @@ describe('TuyaHandler.setValue', () => {
     });
   });
 
+  it('should convert thermostat target temperature from fahrenheit to celsius before sending', async () => {
+    const device = {
+      params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: false }],
+      properties: {
+        properties: [{ code: 'temp_unit_convert', value: 'c' }],
+      },
+      specifications: {
+        functions: [{ code: 'temp_set' }],
+      },
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:temp_set',
+      category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
+      type: DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
+      unit: DEVICE_FEATURE_UNITS.FAHRENHEIT,
+      scale: 1,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub().resolves({ success: true }) },
+      gladys: {},
+      feedbackPollDelayMs: 0,
+      poll: sinon.stub().resolves(),
+    };
+
+    await tuyaHandler.setValue.call(ctx, device, deviceFeature, 68);
+
+    expect(ctx.connector.request.calledOnce).to.equal(true);
+    expect(ctx.connector.request.firstCall.args[0]).to.deep.equal({
+      method: 'POST',
+      path: `${API.VERSION_1_0}/devices/device/commands`,
+      body: { commands: [{ code: 'temp_set', value: 200 }] },
+    });
+  });
+
+  it('should keep invalid thermostat target temperature values untouched before write conversion', async () => {
+    const device = {
+      params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: false }],
+      properties: {
+        properties: [{ code: 'temp_unit_convert', value: 'f' }],
+      },
+      specifications: {
+        functions: [{ code: 'temp_set' }],
+      },
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:temp_set',
+      category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
+      type: DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
+      unit: DEVICE_FEATURE_UNITS.CELSIUS,
+      scale: 1,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub().resolves({ success: true }) },
+      gladys: {},
+      feedbackPollDelayMs: 0,
+      poll: sinon.stub().resolves(),
+    };
+
+    await tuyaHandler.setValue.call(ctx, device, deviceFeature, 'not-a-number');
+
+    expect(ctx.connector.request.calledOnce).to.equal(true);
+    expect(Number.isNaN(ctx.connector.request.firstCall.args[0].body.commands[0].value)).to.equal(true);
+  });
+
+  it('should keep thermostat value unchanged when unit conversion is not recognized', async () => {
+    const device = {
+      params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: false }],
+      properties: {
+        properties: [{ code: 'temp_unit_convert', value: 'c' }],
+      },
+      specifications: {
+        functions: [{ code: 'temp_set' }],
+      },
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:temp_set',
+      category: DEVICE_FEATURE_CATEGORIES.THERMOSTAT,
+      type: DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
+      unit: 'kelvin',
+      scale: 1,
+    };
+
+    const ctx = {
+      connector: { request: sinon.stub().resolves({ success: true }) },
+      gladys: {},
+      feedbackPollDelayMs: 0,
+      poll: sinon.stub().resolves(),
+    };
+
+    await tuyaHandler.setValue.call(ctx, device, deviceFeature, 20);
+
+    expect(ctx.connector.request.calledOnce).to.equal(true);
+    expect(ctx.connector.request.firstCall.args[0].body.commands[0].value).to.equal(200);
+  });
+
   it('should fallback to mapping scale for thermostat target temperature when feature scale is missing', async () => {
     const device = {
       device_type: 'pilot-thermostat',
@@ -542,6 +639,78 @@ describe('TuyaHandler.setValue', () => {
     expect(ctx.poll.calledOnceWithExactly(device)).to.equal(true);
   });
 
+  it('should delay feedback poll after a successful cloud command', async () => {
+    const clock = sinon.useFakeTimers();
+    try {
+      const device = {
+        external_id: 'tuya:device',
+        params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: false }],
+        specifications: {
+          functions: [{ code: 'child_lock' }],
+        },
+      };
+      const deviceFeature = {
+        external_id: 'tuya:device:child_lock',
+        category: DEVICE_FEATURE_CATEGORIES.CHILD_LOCK,
+        type: DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY,
+      };
+
+      const ctx = {
+        connector: {
+          request: sinon.stub().resolves({ success: true }),
+        },
+        gladys: {},
+        poll: sinon.stub().resolves(),
+      };
+
+      const promise = tuyaHandler.setValue.call(ctx, device, deviceFeature, 1);
+      await clock.tickAsync(999);
+      expect(ctx.poll.called).to.equal(false);
+      await clock.tickAsync(1);
+      await promise;
+      expect(ctx.poll.calledOnceWithExactly(device)).to.equal(true);
+    } finally {
+      clock.restore();
+    }
+  });
+
+  it('should warn when delayed feedback poll fails after a successful cloud command', async () => {
+    const logger = {
+      debug: sinon.stub(),
+      warn: sinon.stub(),
+    };
+    const { setValue } = proxyquire('../../../../services/tuya/lib/tuya.setValue', {
+      '../../../utils/logger': logger,
+    });
+
+    const device = {
+      external_id: 'tuya:device',
+      params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: false }],
+      specifications: {
+        functions: [{ code: 'child_lock' }],
+      },
+    };
+    const deviceFeature = {
+      external_id: 'tuya:device:child_lock',
+      category: DEVICE_FEATURE_CATEGORIES.CHILD_LOCK,
+      type: DEVICE_FEATURE_TYPES.CHILD_LOCK.BINARY,
+    };
+
+    const ctx = {
+      connector: {
+        request: sinon.stub().resolves({ success: true }),
+      },
+      gladys: {},
+      feedbackPollDelayMs: 0,
+      poll: sinon.stub().rejects(new Error('poll failed')),
+    };
+
+    await setValue.call(ctx, device, deviceFeature, 1);
+
+    expect(logger.warn.calledOnce).to.equal(true);
+    expect(logger.warn.firstCall.args[0]).to.include('feedback poll failed');
+  });
+
   it('should reject when the selected cloud strategy command fails', async () => {
     const device = {
       params: [{ name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: false }],
diff --git a/server/test/services/tuya/lib/utils/tuya.cloudStrategy.test.js b/server/test/services/tuya/lib/utils/tuya.cloudStrategy.test.js
new file mode 100644
index 0000000000..dabc91c6c4
--- /dev/null
+++ b/server/test/services/tuya/lib/utils/tuya.cloudStrategy.test.js
@@ -0,0 +1,41 @@
+const { expect } = require('chai');
+
+const {
+  CLOUD_STRATEGY,
+  getConfiguredCloudStrategy,
+  resolveCloudStrategy,
+} = require('../../../../../services/tuya/lib/utils/tuya.cloudStrategy');
+
+describe('Tuya cloud strategy utils', () => {
+  it('should return null when cloud codes are invalid', () => {
+    const strategy = resolveCloudStrategy(
+      {
+        specifications: {
+          functions: [{ code: null }],
+          status: [],
+        },
+      },
+      'smart-socket',
+    );
+
+    expect(strategy).to.equal(null);
+  });
+
+  it('should resolve legacy strategy from specifications status', () => {
+    const strategy = resolveCloudStrategy(
+      {
+        specifications: {
+          functions: [],
+          status: [{ code: 'switch_1' }],
+        },
+      },
+      'smart-socket',
+    );
+
+    expect(strategy).to.equal(CLOUD_STRATEGY.LEGACY);
+  });
+
+  it('should default configured strategy to legacy', () => {
+    expect(getConfiguredCloudStrategy({ params: [] })).to.equal(CLOUD_STRATEGY.LEGACY);
+  });
+});
diff --git a/server/test/services/tuya/lib/utils/tuya.normalize.test.js b/server/test/services/tuya/lib/utils/tuya.normalize.test.js
new file mode 100644
index 0000000000..54a600ca9d
--- /dev/null
+++ b/server/test/services/tuya/lib/utils/tuya.normalize.test.js
@@ -0,0 +1,18 @@
+const { expect } = require('chai');
+
+const { normalizeBoolean, normalizeTemperatureUnit } = require('../../../../../services/tuya/lib/utils/tuya.normalize');
+const { DEVICE_FEATURE_UNITS } = require('../../../../../utils/constants');
+
+describe('Tuya normalize utils', () => {
+  it('should normalize known boolean truthy values', () => {
+    expect(normalizeBoolean('ON')).to.equal(true);
+  });
+
+  it('should return null for unknown temperature units', () => {
+    expect(normalizeTemperatureUnit('kelvin')).to.equal(null);
+  });
+
+  it('should normalize celsius aliases', () => {
+    expect(normalizeTemperatureUnit('celcius')).to.equal(DEVICE_FEATURE_UNITS.CELSIUS);
+  });
+});
diff --git a/server/test/services/tuya/lib/utils/tuya.report.test.js b/server/test/services/tuya/lib/utils/tuya.report.test.js
new file mode 100644
index 0000000000..6ecb3de4ed
--- /dev/null
+++ b/server/test/services/tuya/lib/utils/tuya.report.test.js
@@ -0,0 +1,50 @@
+const { expect } = require('chai');
+
+const {
+  buildCloudReport,
+  mergeTuyaReport,
+  withTuyaReport,
+} = require('../../../../../services/tuya/lib/utils/tuya.report');
+
+describe('Tuya report utils', () => {
+  it('should return base report when merge patch is missing', () => {
+    const report = mergeTuyaReport(
+      {
+        schema_version: 2,
+        cloud: {
+          assembled: {
+            specifications: { foo: 'bar' },
+          },
+          raw: {},
+        },
+        local: {
+          scan: { source: 'udp' },
+        },
+      },
+      null,
+    );
+
+    expect(report.cloud.assembled.specifications).to.deep.equal({ foo: 'bar' });
+    expect(report.local.scan).to.deep.equal({ source: 'udp' });
+  });
+
+  it('should return the original device when withTuyaReport receives no device', () => {
+    expect(withTuyaReport(null, { local: { scan: null } })).to.equal(null);
+  });
+
+  it('should build cloud report without device list entry when unavailable', () => {
+    const report = buildCloudReport({
+      deviceId: 'device-id',
+      listDeviceEntry: null,
+      specResult: null,
+      detailsResult: null,
+      propsResult: null,
+      modelResult: null,
+      device: null,
+    });
+
+    expect(report.cloud.raw.device_list_entry).to.equal(null);
+    expect(report.cloud.raw.device_specification).to.equal(null);
+    expect(report.cloud.raw.thing_model).to.equal(null);
+  });
+});

From 33241a1dbefc00d24749a612e25f636c09145d94 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Tue, 3 Mar 2026 19:26:56 +0100
Subject: [PATCH 89/90] refactor(tuya): simplify poll temperature guards

---
 server/services/tuya/lib/tuya.poll.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index 96e6af1cec..82dbacc2d0 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -159,9 +159,7 @@ const convertTemperatureValue = (value, fromUnit, toUnit, deviceFeature, code) =
     return value;
   }
   const convertedValue =
-    fromUnit === DEVICE_FEATURE_UNITS.CELSIUS
-      ? celsiusToFahrenheit(numericValue)
-      : fahrenheitToCelsius(numericValue);
+    fromUnit === DEVICE_FEATURE_UNITS.CELSIUS ? celsiusToFahrenheit(numericValue) : fahrenheitToCelsius(numericValue);
   const roundedValue = roundTemperatureValue(convertedValue, code);
   if (code === 'temp_current' && deviceFeature) {
     const min = Number(deviceFeature.min);

From 034de269b7131a7490db6de302efcd213485e819 Mon Sep 17 00:00:00 2001
From: Terdious <thomas.lemaistre76@gmail.com>
Date: Wed, 4 Mar 2026 18:20:49 +0100
Subject: [PATCH 90/90] refactor(tuya): remove dead defensive guards

---
 .../tuya/lib/device/tuya.convertFeature.js    | 12 +--
 server/services/tuya/lib/tuya.poll.js         | 23 ++----
 .../services/tuya/lib/tuya.localPoll.test.js  | 74 +++++++++++++++++
 .../test/services/tuya/lib/tuya.poll.test.js  | 79 -------------------
 4 files changed, 86 insertions(+), 102 deletions(-)

diff --git a/server/services/tuya/lib/device/tuya.convertFeature.js b/server/services/tuya/lib/device/tuya.convertFeature.js
index 1cec8b8a1f..0fe4ec5bd2 100644
--- a/server/services/tuya/lib/device/tuya.convertFeature.js
+++ b/server/services/tuya/lib/device/tuya.convertFeature.js
@@ -50,10 +50,10 @@ function convertFeature(tuyaFunctions, externalId, options = {}) {
     max: 1,
     ...featuresCategoryAndType,
   };
-  if ('min' in valuesObject) {
+  if (typeof valuesObject.min === 'number') {
     feature.min = valuesObject.min;
   }
-  if ('max' in valuesObject) {
+  if (typeof valuesObject.max === 'number') {
     feature.max = valuesObject.max;
   }
   if ('scale' in valuesObject) {
@@ -68,12 +68,8 @@ function convertFeature(tuyaFunctions, externalId, options = {}) {
     feature.type === DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE
   ) {
     const divider = 10 ** feature.scale;
-    if (typeof feature.min === 'number') {
-      feature.min /= divider;
-    }
-    if (typeof feature.max === 'number') {
-      feature.max /= divider;
-    }
+    feature.min /= divider;
+    feature.max /= divider;
   }
   if (feature.read_only === false) {
     feature.has_feedback = true;
diff --git a/server/services/tuya/lib/tuya.poll.js b/server/services/tuya/lib/tuya.poll.js
index 82dbacc2d0..8ec58ea8f3 100644
--- a/server/services/tuya/lib/tuya.poll.js
+++ b/server/services/tuya/lib/tuya.poll.js
@@ -218,9 +218,6 @@ const extractShadowValues = (device, response) => {
 const transformFeatureValue = (device, deviceFeature, code, rawValue, deviceTemperatureUnit) => {
   const featureWithFallbackScale = getFeatureWithFallbackScale(device, deviceFeature, code);
   const reader = getFeatureReader(featureWithFallbackScale);
-  if (!reader) {
-    return { skipped: true };
-  }
   let transformedValue = reader(rawValue, featureWithFallbackScale);
   if (isTemperatureFeature(featureWithFallbackScale, code)) {
     transformedValue = convertTemperatureValue(
@@ -289,12 +286,7 @@ const pollCloudFeatures = async function pollCloudFeatures(device, deviceFeature
       return;
     }
     try {
-      const resultValue = transformFeatureValue(device, deviceFeature, code, value, deviceTemperatureUnit);
-      if (resultValue.skipped) {
-        summary.skipped += 1;
-        return;
-      }
-      const { transformedValue } = resultValue;
+      const { transformedValue } = transformFeatureValue(device, deviceFeature, code, value, deviceTemperatureUnit);
       const { lastValue, lastValueChanged } = getCurrentFeatureState(this.gladys, deviceFeature);
       const { changed } = emitFeatureState(this.gladys, deviceFeature, transformedValue, lastValue, lastValueChanged);
       if (changed) {
@@ -400,12 +392,13 @@ async function poll(device) {
             return;
           }
           try {
-            const resultValue = transformFeatureValue(device, deviceFeature, code, rawValue, deviceTemperatureUnit);
-            if (resultValue.skipped) {
-              pendingCloudFeatures.push(deviceFeature);
-              return;
-            }
-            const { transformedValue } = resultValue;
+            const { transformedValue } = transformFeatureValue(
+              device,
+              deviceFeature,
+              code,
+              rawValue,
+              deviceTemperatureUnit,
+            );
             const { lastValue, lastValueChanged } = getCurrentFeatureState(this.gladys, deviceFeature);
             const { changed } = emitFeatureState(
               this.gladys,
diff --git a/server/test/services/tuya/lib/tuya.localPoll.test.js b/server/test/services/tuya/lib/tuya.localPoll.test.js
index 476f6db2d1..33185372f0 100644
--- a/server/test/services/tuya/lib/tuya.localPoll.test.js
+++ b/server/test/services/tuya/lib/tuya.localPoll.test.js
@@ -304,6 +304,80 @@ describe('TuyaHandler.localPoll', () => {
     throw new Error('Expected error');
   });
 
+  it('should fallback to a generic socket error when socket error has no message', async () => {
+    const connect = sinon.stub().resolves();
+    const get = sinon.stub().returns(new Promise(() => {}));
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.get = get;
+      this.disconnect = disconnect;
+      this.on = sinon.stub();
+      this.once = sinon.stub().callsFake((event, cb) => {
+        if (event === 'error') {
+          cb({});
+        }
+      });
+      this.removeListener = sinon.stub();
+    }
+    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+      tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
+    });
+
+    try {
+      await localPoll({
+        deviceId: 'device',
+        ip: '10.1.0.53',
+        localKey: 'key',
+        protocolVersion: '3.3',
+      });
+    } catch (e) {
+      expect(e).to.be.instanceOf(BadParameters);
+      expect(e.message).to.equal('Local poll socket error');
+      return;
+    }
+    throw new Error('Expected error');
+  });
+
+  it('should normalize unreachable device errors when EHOSTUNREACH is only present in the message', async () => {
+    const connect = sinon.stub().resolves();
+    const get = sinon.stub().returns(new Promise(() => {}));
+    const disconnect = sinon.stub().resolves();
+    function TuyAPIStub() {
+      this.connect = connect;
+      this.get = get;
+      this.disconnect = disconnect;
+      this.on = sinon.stub();
+      this.once = sinon.stub().callsFake((event, cb) => {
+        if (event === 'error') {
+          cb({ message: 'Error from socket: connect EHOSTUNREACH 10.1.0.53:6668' });
+        }
+      });
+      this.removeListener = sinon.stub();
+    }
+    const { localPoll } = proxyquire('../../../../services/tuya/lib/tuya.localPoll', {
+      tuyapi: TuyAPIStub,
+      '@demirdeniz/tuyapi-newgen': function TuyAPINewGenStub() {},
+    });
+
+    try {
+      await localPoll({
+        deviceId: 'device',
+        ip: '10.1.0.53',
+        localKey: 'key',
+        protocolVersion: '3.3',
+      });
+    } catch (e) {
+      expect(e).to.be.instanceOf(BadParameters);
+      expect(e.message).to.equal(
+        'Local device unreachable at 10.1.0.53:6668 (EHOSTUNREACH). Device may be offline, unplugged, or no longer connected to Wi-Fi.',
+      );
+      return;
+    }
+    throw new Error('Expected error');
+  });
+
   it('should keep the original connect error when a socket error also occurs', async () => {
     const connect = sinon.stub().rejects(new Error('connect failed'));
     const get = sinon.stub();
diff --git a/server/test/services/tuya/lib/tuya.poll.test.js b/server/test/services/tuya/lib/tuya.poll.test.js
index 4395c00f4f..248f777774 100644
--- a/server/test/services/tuya/lib/tuya.poll.test.js
+++ b/server/test/services/tuya/lib/tuya.poll.test.js
@@ -535,41 +535,6 @@ describe('TuyaHandler.poll with local mapping', () => {
     expect(emit.called).to.equal(false);
   });
 
-  it('should skip cloud feature when transform loses the reader', async () => {
-    const request = sinon.stub().resolves({
-      result: [{ code: 'temp_set', value: 210 }],
-    });
-    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {});
-    const emit = sinon.stub();
-
-    let categoryAccessCount = 0;
-    const feature = {
-      external_id: 'tuya:device:temp_set',
-      get category() {
-        categoryAccessCount += 1;
-        return categoryAccessCount === 1 ? DEVICE_FEATURE_CATEGORIES.THERMOSTAT : null;
-      },
-      type: DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
-      unit: DEVICE_FEATURE_UNITS.CELSIUS,
-    };
-
-    await poll.call(
-      {
-        connector: { request },
-        gladys: {
-          event: { emit },
-        },
-      },
-      {
-        external_id: 'tuya:device',
-        features: [feature],
-      },
-    );
-
-    expect(request.calledOnce).to.equal(true);
-    expect(emit.called).to.equal(false);
-  });
-
   it('should convert cloud thermostat temperatures from reported unit', async () => {
     const request = sinon.stub().resolves({
       result: [
@@ -712,50 +677,6 @@ describe('TuyaHandler.poll with local mapping', () => {
     });
   });
 
-  it('should fallback to cloud when local transform loses the reader', async () => {
-    const localPoll = sinon.stub().resolves({ dps: { 125: 210 } });
-    const request = sinon.stub().resolves({ result: [] });
-    const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {
-      './tuya.localPoll': { localPoll },
-    });
-    const emit = sinon.stub();
-
-    let categoryAccessCount = 0;
-    const feature = {
-      external_id: 'tuya:device:temp_set',
-      get category() {
-        categoryAccessCount += 1;
-        return categoryAccessCount === 1 ? DEVICE_FEATURE_CATEGORIES.THERMOSTAT : null;
-      },
-      type: DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
-      unit: DEVICE_FEATURE_UNITS.CELSIUS,
-    };
-
-    await poll.call(
-      {
-        connector: { request },
-        gladys: {
-          event: { emit },
-        },
-      },
-      {
-        external_id: 'tuya:device',
-        device_type: 'pilot-thermostat',
-        params: [
-          { name: DEVICE_PARAM_NAME.IP_ADDRESS, value: '1.1.1.1' },
-          { name: DEVICE_PARAM_NAME.LOCAL_KEY, value: 'key' },
-          { name: DEVICE_PARAM_NAME.PROTOCOL_VERSION, value: '3.5' },
-          { name: DEVICE_PARAM_NAME.LOCAL_OVERRIDE, value: true },
-        ],
-        features: [feature],
-      },
-    );
-
-    expect(localPoll.calledOnce).to.equal(true);
-    expect(request.calledOnce).to.equal(true);
-    expect(emit.called).to.equal(false);
-  });
-
   it('should keep existing temperature unit when local unit property has no dp_id', async () => {
     const localPoll = sinon.stub().resolves({ dps: { 116: 158 } });
     const { poll } = proxyquire('../../../../services/tuya/lib/tuya.poll', {