Merge pull request #336 from uzlonewolf/misc

Misc minor updates

Author: jasonacox

examples/async_send_receive.py

@@ -8,6 +8,7 @@
  For more information see https://github.com/jasonacox/tinytuya
 
 """
+import time
 import tinytuya
 
 # tinytuya.set_debug(True)
@@ -16,38 +17,49 @@
 d.set_version(3.3)
 d.set_socketPersistent(True)
 
+# Devices will close the connection if they do not receve data every 30 seconds
+# Sending heartbeat packets every 9 seconds gives some wiggle room for lost packets or loop lag
+PING_TIME = 9
+
+# Option - also poll
+POLL_TIME = 60
+
 print(" > Send Request for Status < ")
-payload = d.generate_payload(tinytuya.DP_QUERY)
-d.send(payload)
+d.status(nowait=True)
 
 print(" > Begin Monitor Loop <")
+pingtime = time.time() + PING_TIME
+polltime = time.time() + POLL_TIME
 while(True):
     # See if any data is available
     data = d.receive()
-    print('Received Payload: %r' % data)
-
-    # Send keyalive heartbeat
-    print(" > Send Heartbeat Ping < ")
-    payload = d.generate_payload(tinytuya.HEART_BEAT)
-    d.send(payload)
-
-    # Option - Some plugs require an UPDATEDPS command to update their power data points
-
-    # print(" > Send Request for Status < ")
-    # payload = d.generate_payload(tinytuya.DP_QUERY)
-    # d.send(payload)
-
-    # # See if any data is available
-    # data = d.receive()
-    # print('Received Payload: %r' % data)
-
-    # print(" > Send DPS Update Request < ")
-    # payload = d.generate_payload(tinytuya.UPDATEDPS,['18','19','20'])
-    # Some Tuya devices will not accept the DPS index values for UPDATEDPS - try:
-    # payload = d.generate_payload(tinytuya.UPDATEDPS)
-    # d.send(payload)
-    
-    # # See if any data is available
-    # data = d.receive()
-    # print('Received Payload: %r' % data)
-    
+    if data:
+        print('Received Payload: %r' % data)
+
+    if( pingtime <= time.time() ):
+        pingtime = time.time() + PING_TIME
+        # Send keep-alive heartbeat
+        print(" > Send Heartbeat Ping < ")
+        d.heartbeat(nowait=True)
+
+    # Option - Poll for status
+    if( polltime <= time.time() ):
+        polltime = time.time() + POLL_TIME
+
+        # Option - Some plugs require an UPDATEDPS command to update their power data points
+        if False:
+            print(" > Send DPS Update Request < ")
+
+            # # Some Tuya devices require a list of DPs to update
+            # payload = d.generate_payload(tinytuya.UPDATEDPS,['18','19','20'])
+            # data = d.send(payload)
+            # print('Received Payload: %r' % data)
+
+            # # Other devices will not accept the DPS index values for UPDATEDPS - try:
+            # payload = d.generate_payload(tinytuya.UPDATEDPS)
+            # data = d.send(payload)
+            # print('Received Payload: %r' % data)
+
+        print(" > Send Request for Status < ")
+        data = d.status()
+        print('Received Payload: %r' % data)

examples/getstatus.py

@@ -26,5 +26,5 @@
 
 # Get the status of the device 
 # e.g. {'devId': '0071299988f9376255b', 'dps': {'1': True, '3': 208, '101': False}}
-data = d.get_status()
-print(data)
+data = d.status()
+print(data)

tinytuya/Cloud.py

@@ -127,7 +127,7 @@ def setregion(self, apiRegion=None):
         if self.apiRegion == "in":
             self.urlhost = "openapi.tuyain.com"      # India Datacenter
 
-    def _tuyaplatform(self, uri, action='GET', post=None, ver='v1.0', recursive=False, query=None, content_type='application/json'):
+    def _tuyaplatform(self, uri, action='GET', post=None, ver='v1.0', recursive=False, query=None, content_type=None):
         """
         Handle GET and POST requests to Tuya Cloud
         """
@@ -141,12 +141,14 @@ def _tuyaplatform(self, uri, action='GET', post=None, ver='v1.0', recursive=Fals
         headers = {}
         body = {}
         sign_url = url
-        if content_type:
-            headers['Content-type'] = content_type
         if post is not None:
             body = json.dumps(post)
         if action not in ('GET', 'POST', 'PUT', 'DELETE'):
             action = 'POST' if post else 'GET'
+        if action == 'POST' and content_type is None:
+            content_type = 'application/json'
+        if content_type:
+            headers['Content-type'] = content_type
         if query:
             # note: signature must be calculated before URL-encoding!
             if type(query) == str:

tinytuya/scanner.py

@@ -68,7 +68,7 @@
 max_parallel = 300
 connect_timeout = 3
 
-devinfo_keys = ('ip', 'mac', 'name', 'key', 'gwId', 'active', 'ablilty', 'encrypt', 'productKey', 'version', 'token', 'wf_cfg' )
+devinfo_keys = ('ip', 'mac', 'name', 'key', 'gwId', 'active', 'ability', 'encrypt', 'productKey', 'version', 'token', 'wf_cfg' )
 # id ver
 
 TermColors = namedtuple("TermColors", "bold, subbold, normal, dim, alert, alertdim, cyan, red, yellow")
@@ -170,6 +170,10 @@ def __init__( self, ip, deviceinfo, options, debug ):
 
         if not deviceinfo:
             deviceinfo = {}
+        # some devices report "ability" but most have this as the typo "ablilty"
+        if 'ablilty' in deviceinfo and 'ability' not in deviceinfo:
+            deviceinfo['ability'] = deviceinfo['ablilty']
+            del deviceinfo['ablilty']
         self.deviceinfo = deviceinfo
         for k in devinfo_keys:
             if k not in deviceinfo: