Merge branch 'bulb-rewrite' of https://github.com/uzlonewolf/tinytuya into pr/617

Author: jasonacox

README.md

@@ -42,6 +42,22 @@ pipx install tinytuya
 
 Pip will attempt to install `cryptography`, `requests` and `colorama` if not already installed.
 
+### Alternate Install on Space- or Dependency-Limited Systems
+
+On systems with limited space (such as an OpenWRT router), or if you would like to use a different cryptography library, you can install TinyTuya without automatic dependencies and manually install them yourself.
+
+First, install a cryptography library.  TinyTuya supports:
+* *cryptography* - Newest, requires OpenSSL - `python -m pip install cryptography`
+* *PyCryptodome* - Another good alternative, does not require OpenSSL, still actively developed - `python -m pip install pycryptodome` or `python -m pip install pycryptodomex`
+* *pyaes* - Pure Python, but is abandoned and does not support v3.5+ devices - `python -m pip install pyaes`
+* *PyCrypto* - Predecessor to PyCryptodome, is also abandoned and does not support v3.5+ devices - `python -m pip install pycrypto`
+
+Optional: install `colorama` for terminal color support: `python -m pip install colorama`
+
+Required for Wizard or Cloud functionality, Optional otherwise: install `requests` for Cloud functions to work: `python -m pip install requests`
+
+Finally, install TinyTuya without dependencies: `python -m pip install --no-deps tinytuya`
+
 ## Tuya Device Preparation
 
 Controlling and monitoring Tuya devices on your network requires the following:
@@ -90,7 +106,7 @@ TinyTuya has a built-in setup Wizard that uses the Tuya IoT Cloud Platform to ge
       ```bash
       python -m tinytuya wizard   # use -nocolor for non-ANSI-color terminals
       ```
-    * The **Wizard** will prompt you for the *API ID* key, API *Secret*, API *Region* (cn, us, us-e, eu, eu-w, or in) from your Tuya IoT project as set in Step 3 above.
+    * The **Wizard** will prompt you for the *API ID* key, API *Secret*, API *Region* (cn, us, us-e, eu, eu-w, sg, or in) from your Tuya IoT project as set in Step 3 above.
         * To find those again, go to [iot.tuya.com](https://iot.tuya.com/), choose your project and click `Overview`
             * API Key: Access ID/Client ID
             * API Secret: Access Secret/Client Secret
@@ -459,7 +475,7 @@ tinytuya <command> [-debug] [-nocolor] [-h] [-yes] [-no-poll] [-device-file FILE
   Wizard
       tinytuya wizard [-h] [-debug] [-force [0.0.0.0/24 ...]] [-no-broadcasts] [-nocolor] [-yes] [-no-poll]
                 [-device-file FILE] [-raw-response-file FILE] [-snapshot-file FILE] [-credentials-file FILE]
-                [-key KEY] [-secret SECRET] [-region {cn,eu,eu-w,in,us,us-e}] [-device DEVICE [DEVICE ...]]
+                [-key KEY] [-secret SECRET] [-region {cn,eu,eu-w,in,sg,us,us-e}] [-device DEVICE [DEVICE ...]]
                 [-dry-run] [max_time]
 
         Common Options
@@ -482,7 +498,7 @@ tinytuya <command> [-debug] [-nocolor] [-h] [-yes] [-no-poll] [-device-file FILE
         -credentials-file    JSON file to load/save Cloud credentials from/to [Default: tinytuya.json]
         -key KEY             Cloud API Key to use
         -secret SECRET       Cloud API Secret to use
-        -region              Cloud API Region to use {cn,eu,eu-w,in,us,us-e}
+        -region              Cloud API Region to use {cn,eu,eu-w,in,sg,us,us-e}
         -device DEVICE(S)    One or more Device ID(s) to use
 
   Scan

RELEASE.md

@@ -4,6 +4,10 @@
 
 * This update makes the colorama dependency optional for the tinytuya library, allowing it to function without colorama while gracefully disabling color output. This will help with memory lor dependency limited platforms. Update by @uzlonewolf in https://github.com/jasonacox/tinytuya/pull/637. 
 
+## v1.17.2 - BulbDevice Fix
+
+* Add Singapore datacenter, update BulbDevice for non-bulb devices again by @uzlonewolf in https://github.com/jasonacox/tinytuya/pull/625
+
 ## v1.17.1 - Fix BulbDevice
 
 * Fix BulbDevice for non-bulb devices. This will allow BulbDevice to be used even for non-bulb devices, e.g. turn_on() & turn_off(), by @uzlonewolf in https://github.com/jasonacox/tinytuya/pull/620.

server/Dockerfile

@@ -4,7 +4,7 @@ ENV PYTHONUNBUFFERED=1
 ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
 RUN pip install --no-cache-dir --upgrade pip setuptools wheel
 RUN pip install --no-cache-dir cryptography pycryptodome
-RUN pip3 install --no-cache-dir netifaces tinytuya
+RUN pip install --no-cache-dir netifaces tinytuya psutil colorama requests
 COPY . .
 CMD ["python3", "server.py"]
 EXPOSE 8888

server/README.md

@@ -113,6 +113,12 @@ The UI at http://localhost:8888 allows you to view and control the devices.
 
 ## Release Notes
 
+### p15 - Cross-Platform Memory Stats
+
+* Switched to using the `psutil` library for memory usage stats, making server.py fully cross-platform (Windows, macOS, Linux). Fixes issue #634.
+* Memory usage is now reported on all platforms if `psutil` is installed; if not, the field is set to None.
+* Added requirements to documentation and header: `pip install psutil tinytuya colorama requests`.
+
 ### p14 - Recovery Logic
 
 * Add main loop logic to try to recover when exception occurs.

server/server.py

@@ -7,6 +7,9 @@
 Date: June 11, 2023
 For more information see https://github.com/jasonacox/tinytuya
 
+Requirements:
+    pip install psutil tinytuya colorama requests
+
 Description
     Server continually listens for Tuya UDP discovery packets and updates the database of devices
     and uses devices.json to determine metadata about devices.
@@ -43,7 +46,14 @@
     print("WARN: Unable to import requests library, Cloud functions will not work.")
     print("WARN: Check dependencies. See https://github.com/jasonacox/tinytuya/issues/377")
     print("WARN: Error: {}.".format(impErr.args[0]))
-import resource
+
+# Memory usage reporting uses the 'psutil' library, which is cross-platform.
+# If 'psutil' is not available, memory stats will be set to None.
+try:
+    import psutil
+    HAS_PSUTIL = True
+except ImportError:
+    HAS_PSUTIL = False
 import signal
 import sys
 import os
@@ -62,7 +72,7 @@
 import tinytuya
 from tinytuya import scanner
 
-BUILD = "p14"
+BUILD = "p15"
 
 # Defaults from Environment
 APIPORT = int(os.getenv("APIPORT", "8888"))
@@ -426,7 +436,12 @@ def do_GET(self):
         elif self.path == '/stats':
             # Give Internal Stats
             serverstats['ts'] = int(time.time())
-            serverstats['mem'] = resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
+            # Report memory usage using psutil if available (cross-platform)
+            if HAS_PSUTIL:
+                process = psutil.Process(os.getpid())
+                serverstats['mem'] = process.memory_info().rss // 1024  # Resident Set Size in KB
+            else:
+                serverstats['mem'] = None  # psutil not available
             serverstats['cloudcreds'] = cloudcreds
             serverstats['cloudsync'] = cloudsync
             serverstats['cloudsyncdone'] = cloudsyncdone

tinytuya/core/core.py

@@ -79,7 +79,14 @@
 from __future__ import print_function  # python 2.7 support
 import logging
 import sys
-from colorama import init
+
+try:
+    from colorama import init
+    HAVE_COLORAMA = True
+except ImportError:
+    HAVE_COLORAMA = False
+
+HAVE_COLOR = HAVE_COLORAMA or not sys.platform.startswith('win')
 
 from .crypto_helper import AESCipher
 
@@ -91,7 +98,8 @@
 
 
 # Colorama terminal color capability for all platforms
-init()
+if HAVE_COLORAMA:
+    init()
 
 version_tuple = (1, 17, 3)  # Major, Minor, Patch
 version = __version__ = "%d.%d.%d" % version_tuple
@@ -124,6 +132,7 @@ def hex2bin(x):
 
 def set_debug(toggle=True, color=True):
     """Enable tinytuya verbose logging"""
+    color = color and HAVE_COLOR
     if toggle:
         if color:
             logging.basicConfig(
@@ -197,6 +206,7 @@ def appenddevice(newdevice, devices):
 
 # Terminal color helper
 def termcolor(color=True):
+    color = color and HAVE_COLOR
     if color is False:
         # Disable Terminal Color Formatting
         bold = subbold = normal = dim = alert = alertdim = cyan = red = yellow = ""

tinytuya/scanner.py

@@ -25,9 +25,16 @@
 import errno
 import base64
 import traceback
-from colorama import init
 import tinytuya
 
+try:
+    from colorama import init
+    HAVE_COLORAMA = True
+except ImportError:
+    HAVE_COLORAMA = False
+
+HAVE_COLOR = HAVE_COLORAMA or not sys.platform.startswith('win')
+
 # Optional libraries required for forced scanning
 #try:
 #    from getmac import get_mac_address
@@ -54,7 +61,8 @@
     PSULIBS = False
 
 # Colorama terminal color capability for all platforms
-init()
+if HAVE_COLORAMA:
+    init()
 
 # Configuration Files
 DEVICEFILE = tinytuya.DEVICEFILE
@@ -205,6 +213,10 @@ def get_ip_to_broadcast():
 def send_discovery_request( iface_list=None ):
     close_sockets = False
 
+    if not tinytuya.AESCipher.CRYPTOLIB_HAS_GCM:
+        # GCM is required for discovery requests
+        return False
+
     if not iface_list:
         close_sockets = True
         iface_list = {}
@@ -1146,6 +1158,7 @@ def devices(verbose=False, scantime=None, color=True, poll=True, forcescan=False
 
     """
     # Terminal formatting
+    color = color and HAVE_COLOR
     termcolors = tinytuya.termcolor(color)
     #(bold, subbold, normal, dim, alert, alertdim, cyan, red, yellow) = termcolors
     term = TermColors( *termcolors )
@@ -1920,6 +1933,7 @@ def snapshot(color=True, assume_yes=False, skip_poll=None):
         skip_poll = True or False, auto-answer 'no' to "Poll local devices?" (overrides assume_yes)
     """
     # Terminal formatting
+    color = color and HAVE_COLOR
     termcolors = tinytuya.termcolor(color)
     term = TermColors( *termcolors )
 
@@ -1992,6 +2006,7 @@ def alldevices(color=True, scantime=None, forcescan=False, discover=True, assume
         color = True or False, print output in color [Default: True]
     """
     # Terminal formatting
+    color = color and HAVE_COLOR
     #(bold, subbold, normal, dim, alert, alertdim, cyan, red, yellow) = tinytuya.termcolor(color)
     termcolors = tinytuya.termcolor(color)
     term = TermColors( *termcolors )
@@ -2031,6 +2046,7 @@ def alldevices(color=True, scantime=None, forcescan=False, discover=True, assume
     return
 
 def poll_and_display( tuyadevices, color=True, scantime=None, snapshot=False, forcescan=False, discover=True ): # pylint: disable=W0621
+    color = color and HAVE_COLOR
     termcolors = tinytuya.termcolor(color)
     term = TermColors( *termcolors )
 

tinytuya/wizard.py

@@ -24,9 +24,17 @@
 # Modules
 from __future__ import print_function
 import json
-from colorama import init
 from datetime import datetime
 import tinytuya
+import sys
+
+try:
+    from colorama import init
+    HAVE_COLORAMA = True
+except ImportError:
+    HAVE_COLORAMA = False
+
+HAVE_COLOR = HAVE_COLORAMA or not sys.platform.startswith('win')
 
 # Backward compatibility for python2
 try:
@@ -35,7 +43,8 @@
     pass
 
 # Colorama terminal color capability for all platforms
-init()
+if HAVE_COLORAMA:
+    init()
 
 # Configuration Files
 DEVICEFILE = tinytuya.DEVICEFILE
@@ -114,6 +123,7 @@ def wizard(color=True, retries=None, forcescan=False, nocloud=False, assume_yes=
     except:
         old_devices = {}
 
+    color = color and HAVE_COLOR
     (bold, subbold, normal, dim, alert, alertdim, cyan, red, yellow) = tinytuya.termcolor(color)
 
     print(bold + 'TinyTuya Setup Wizard' + dim + ' [%s]' % (tinytuya.version) + normal)
@@ -150,8 +160,8 @@ def wizard(color=True, retries=None, forcescan=False, nocloud=False, assume_yes=
               "\n        us-e\tUS - Eastern America Data Center (alias: UE)" +
               "\n        eu\tCentral Europe Data Center" +
               "\n        eu-w\tWestern Europe Data Center (alias: WE)" +
-              "\n        in\tIndia Data Center\n" +
-              "\n        sg\tSingapore Data Center")
+              "\n        in\tIndia Data Center" +
+              "\n        sg\tSingapore Data Center\n")
         config['apiRegion'] = input(subbold + "    Enter " + bold + "Your Region" + subbold +
                                     " (Options: cn, us, us-e, eu, eu-w, in, or sg): " + normal)
         # Write Config