Update server.py with cross-platform memory usage stats using psutil #634

Author: jasonacox

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