From 16cb29297bb33e5815efce1d8cc785b6fd760d69 Mon Sep 17 00:00:00 2001
From: rospogrigio <rospogrigio@gmail.com>
Date: Wed, 16 Sep 2020 15:16:59 +0200
Subject: [PATCH] Introduced dps detection with bruteforcing for type_0d
 devices

---
 custom_components/localtuya/config_flow.py    |  9 ++--
 .../localtuya/pytuya/__init__.py              | 49 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/custom_components/localtuya/config_flow.py b/custom_components/localtuya/config_flow.py
index 12f32bc..2779c98 100644
--- a/custom_components/localtuya/config_flow.py
+++ b/custom_components/localtuya/config_flow.py
@@ -1,6 +1,7 @@
 """Config flow for LocalTuya integration integration."""
 import logging
 from importlib import import_module
+from itertools import chain
 
 import voluptuous as vol
 
@@ -78,14 +79,16 @@ async def validate_input(hass: core.HomeAssistant, data):
         data[CONF_LOCAL_KEY],
     )
     pytuyadevice.set_version(float(data[CONF_PROTOCOL_VERSION]))
-    pytuyadevice.set_dpsUsed({str(dps): None for dps in range(1, 151)})
+    detected_dps = {}
+
     try:
-        data = await hass.async_add_executor_job(pytuyadevice.status)
+        detected_dps = await hass.async_add_executor_job(pytuyadevice.detect_available_dps)
     except (ConnectionRefusedError, ConnectionResetError):
         raise CannotConnect
     except ValueError:
         raise InvalidAuth
-    return dps_string_list(data["dps"])
+
+    return dps_string_list(detected_dps)
 
 
 class LocaltuyaConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
diff --git a/custom_components/localtuya/pytuya/__init__.py b/custom_components/localtuya/pytuya/__init__.py
index 58fc637..a701597 100644
--- a/custom_components/localtuya/pytuya/__init__.py
+++ b/custom_components/localtuya/pytuya/__init__.py
@@ -19,6 +19,7 @@
  Functions 
     json = status()          # returns json payload
     set_version(version)     #  3.1 [default] or 3.3
+    detect_available_dps()   # returns a list of available dps provided by the device
     set_dpsUsed(dpsUsed)     
     set_dps(on, dps_index)   # Set int value of any dps index.
     set_timer(num_secs):
@@ -35,6 +36,7 @@
 
 import base64
 from hashlib import md5
+from itertools import chain
 import json
 import logging
 import socket
@@ -52,7 +54,7 @@ except ImportError:
     import pyaes  # https://github.com/ricmoo/pyaes
 
 
-version_tuple = (8, 0, 0)
+version_tuple = (8, 1, 0)
 version = version_string = __version__ = '%d.%d.%d' % version_tuple
 __author__ = 'rospogrigio'
 
@@ -239,6 +241,51 @@ class TuyaDevice(object):
     def set_version(self, version):
         self.version = version
 
+    def detect_available_dps(self):
+        # type_0d devices need a sort of bruteforce querying in order to detect the list of available dps 
+        # experience shows that the dps available are usually in the ranges [1-25] and [100-110]
+        # need to split the bruteforcing in different steps due to request payload limitation (max. length = 255)
+        detected_dps = {}
+
+        # dps 1 must always be sent, otherwise it might fail in case no dps is found in the requested range
+        self.set_dpsUsed({ str(dps): None for dps in chain(range(1,2), range(2, 11)) })
+        try:
+            data = self.status()
+        except Exception as e:
+            print("Failed to get status: [{}]".format(e))
+            raise CannotConnect
+        detected_dps.update( data["dps"] )
+
+        if self.dev_type == "type_0a":
+            return detected_dps
+
+        self.set_dpsUsed({ str(dps): None for dps in chain(range(1,2), range(11, 21)) })
+        try:
+            data = self.status()
+        except Exception as e:
+            print("Failed to get status: [{}]".format(e))
+            raise CannotConnect
+        detected_dps.update( data["dps"] )
+
+        self.set_dpsUsed({ str(dps): None for dps in chain(range(1,2), range(21, 31)) })
+        try:
+            data = self.status()
+        except Exception as e:
+            print("Failed to get status: [{}]".format(e))
+            raise CannotConnect
+        detected_dps.update( data["dps"] )
+
+        self.set_dpsUsed({ str(dps): None for dps in chain(range(1,2), range(100, 111)) })
+        try:
+            data = self.status()
+        except Exception as e:
+            print("Failed to get status: [{}]".format(e))
+            raise CannotConnect
+        detected_dps.update( data["dps"] )
+#        print("DATA IS [{}] detected_dps [{}]".format(data,detected_dps))
+
+        return detected_dps
+
     def set_dpsUsed(self, dpsUsed):
         self.dpsUsed = dpsUsed