Merge pull request #609 from jasonacox/v1.16.3

Add cloud error handling and server recovery logic

Author: jasonacox

.gitignore

@@ -129,3 +129,4 @@ mappings.json
 
 # test scripts
 server/r
+server/tinytuya

RELEASE.md

@@ -1,5 +1,10 @@
 # RELEASE NOTES
 
+## v1.16.3 - Cloud Error Handling
+
+* Add error handling in Cloud getdevices() function for edge case where old devices.json has corrupt or malformed device entries.
+* Server p14 update: Add main loop logic to try to recover when exception occurs.
+
 ## v1.16.2 - Invalid JSON Handling
 
 * Handle invalid binary data in the JSON from the device better by @uzlonewolf in https://github.com/jasonacox/tinytuya/pull/607 re: #606

server/README.md

@@ -113,6 +113,10 @@ The UI at http://localhost:8888 allows you to view and control the devices.
 
 ## Release Notes
 
+### p14 - Recovery Logic
+
+* Add main loop logic to try to recover when exception occurs.
+
 ### p12 - Force Scan
 
 * Added "Force Scan" button to cause server to run a network scan for devices not broadcasting.

server/server.py

@@ -61,9 +61,8 @@
 
 import tinytuya
 from tinytuya import scanner
-import os
 
-BUILD = "p13"
+BUILD = "p14"
 
 # Defaults from Environment
 APIPORT = int(os.getenv("APIPORT", "8888"))
@@ -103,6 +102,7 @@
 if len(sys.argv) > 1 and sys.argv[1].startswith("-d"):
     DEBUGMODE = True
 if DEBUGMODE:
+    tinytuya.set_debug(True)
     logging.basicConfig(
         format="\x1b[31;1m%(levelname)s [%(asctime)s]:%(message)s\x1b[0m", level=logging.DEBUG, 
         datefmt='%d/%b/%y %H:%M:%S'
@@ -819,9 +819,4 @@ def api(port):
         log.debug("Stoppping threads")
         requests.get('http://localhost:%d/stop' % APIPORT, timeout=5)
     except Exception as err:
-        log.error(f"Error in main loop: {err}")
-        running = False
-        # Close down API thread
-        print("Stopping threads...")
-        log.debug("Stoppping threads")
-        requests.get('http://localhost:%d/stop' % APIPORT, timeout=5)
+        log.error("Error in main loop: %s", err)

tinytuya/Cloud.py

@@ -405,6 +405,10 @@ def getdevices(self, verbose=False, oldlist=[], include_map=False):
         old_devices = {}
         if oldlist:
             for dev in oldlist:
+                # make sure dev is a dict and has an id
+                if not isinstance( dev, dict ) or 'id' not in dev:
+                    log.warning("Skipping malformed device entry: %s", dev)
+                    continue
                 dev_id = dev['id']
                 old_devices[dev_id] = dev
 

tinytuya/core/core.py

@@ -84,7 +84,7 @@
 # Colorama terminal color capability for all platforms
 init()
 
-version_tuple = (1, 16, 2)
+version_tuple = (1, 16, 3)  # Major, Minor, Patch
 version = __version__ = "%d.%d.%d" % version_tuple
 __author__ = "jasonacox"