micrOSDevToolKit 3.0.1__tar.gz → 3.0.3__tar.gz

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.3}/MANIFEST.in

@@ -8,10 +8,9 @@ graft env/driver_cp210x/
 
 graft toolkit/simulator_lib
 graft toolkit/workspace/precompiled
+graft toolkit/gateway
 recursive-include toolkit/user_data .include
 recursive-include toolkit/user_data/node_config_archive/.include
-include toolkit/index.html
-include toolkit/img_stream.html
 include toolkit/LM_to_compile.dat
 graft toolkit/user_data/webhooks/
 
@@ -20,4 +19,3 @@ include media/logo_mini.png
 include media/logo.png
 include media/wifi_icon.png
 include media/usb_port_icon.png
-

{microsdevtoolkit-3.0.1/micrOSDevToolKit.egg-info → microsdevtoolkit-3.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.0.1
+Version: 3.0.3
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.3}/devToolKit.py

@@ -11,7 +11,8 @@ if len(sys.argv) > 1 and sys.argv[1] in ['light', '--light']:
 else:
     # INSTALL OPTIONAL DEPENDENCIES - PIP HACK
     from toolkit.lib import pip_package_installer as pip_install
-    pip_install.install_optional_dependencies(['PyQt5', 'opencv-python', 'PyAudio', 'mpy-cross==1.27.0.post2', 'matplotlib'])
+    pip_install.install_optional_dependencies(['PyQt5', 'PyQt5-Qt5', 'PyQt5-sip', 'opencv-python',
+                                               'PyAudio', 'mpy-cross==1.27.0.post2', 'matplotlib'])
     if sys.platform.startswith("win"):
         pip_install.install_optional_dependencies(['pyreadline3'])
 

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.3}/micrOS/micropython/board_commands.json

@@ -1,55 +1,55 @@
 {"esp32":
-     {"erase": "{esptool_interface} --port {dev} erase_flash",
+     {"erase": "{esptool_interface} --port {dev} erase-flash",
       "deploy": "{esptool_interface} --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}",
       "ampy_cmd": "ampy -p {dev} -b 115200 -d 2 {args}",
       "mpremote_cmd": null,
       "cmd_line_info": "[!HINT!] PRESS [EN] BUTTON TO ENABLE DEVICE ERASE...",
       "url": "https://micropython.org/download/ESP32_GENERIC/"},
  "esp32cam":
-      {"erase": "{esptool_interface} --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "*** [!DISCLAIMER!] ***\n\tUSB copy not works with some serial interface\n\tCopy manually: toolkit/workspace/precompiled/micrOSloader.mpy\n\tNetwork.mpy Debug.mpy ConfigHandler.mpy main.py\n\tThen push OTA update over AP mode... Then you are done",
        "url": "https://github.com/lemariva/micropython-camera-driver/tree/master/firmware"},
  "esp32s2":
-      {"erase": "{esptool_interface} --chip esp32s2 --port {dev} --after no_reset erase_flash",
+      {"erase": "{esptool_interface} --chip esp32s2 --port {dev} --after no_reset erase-flash",
        "deploy": "{esptool_interface} --chip esp32s2 --port {dev} --after no_reset --baud 460800 write_flash -z 0x1000 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINT!] Hold on Button 0 -> Press Button Reset -> Release Button 0 TO ENABLE DEVICE ERASE...",
        "url": "https://micropython.org/download/ESP32_GENERIC_S2/"},
  "tinypico":
-      {"erase": "{esptool_interface} --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32 --port {dev} --baud 921600 write_flash -z 0x1000 {micropython}",
        "mpremote_cmd": null,
        "ampy_cmd": "ampy -p {dev} -b 115200 -d 2 {args}",
        "cmd_line_info": "",
        "url": "https://micropython.org/download/UM_TINYPICO/"},
  "esp32s3_spiram_oct":
-      {"erase": "{esptool_interface} --chip esp32s3 --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --chip esp32s3 --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32s3 --port {dev} write_flash -z 0 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINNT!] Press boot button under connecting the board over USB: enables flash erase",
        "url": "https://micropython.org/download/ESP32_GENERIC_S3/"},
  "esp32s3":
-     {"erase": "{esptool_interface} --chip esp32s3 --port {dev} erase_flash",
+     {"erase": "{esptool_interface} --chip esp32s3 --port {dev} erase-flash",
       "deploy": "{esptool_interface} --chip esp32s3 --port {dev} write_flash -z 0 {micropython}",
       "mpremote_cmd": "mpremote",
       "cmd_line_info": "[!HINNT!] Press boot button under connecting board over USB: enables flash erase",
       "url": "https://micropython.org/download/ESP32_GENERIC_S3/"},
  "esp32c3":
-      {"erase": "{esptool_interface} --chip esp32c3 --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --chip esp32c3 --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32c3 --port {dev} --baud 460800 write_flash -z 0x0 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINT!] Fully automatic deployment...",
        "url": "https://micropython.org/download/ESP32_GENERIC_C3/"},
  "esp32c6":
-      {"erase": "{esptool_interface} --chip esp32c6 --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --chip esp32c6 --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32c6 --port {dev} --baud 460800 write_flash -z 0x0 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINT!] Fully automatic deployment...",
        "url": "https://micropython.org/download/ESP32_GENERIC_C6/"},
   "esp32c5":
-      {"erase": "{esptool_interface} --chip esp32c5 --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --chip esp32c5 --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32c5 --port {dev} --baud 460800 write_flash 0x2000 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINT!] Fully automatic deployment...",

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.3}/micrOS/source/Server.py

@@ -267,7 +267,7 @@ class ShellCli(Client, Shell):
             try:
                 # Read request msg from client
                 state, request = await self.read()
-                if state or request in ('exit', ''):
+                if state or request.strip() in ('exit', ''):
                     break
                 # Run micrOS shell with request string
                 Client.console("[ShellCli] --- #Run shell")
@@ -333,7 +333,7 @@ class Server:
             self._timeout = 5 if soc_timeout < 5 else soc_timeout
             # ---         ----
             self._initialized = True
-            Client.console("[ socket server ] <<constructor>>")
+            Client.console("[ socket server ] <<init>>")
 
     #####################################
     #       Socket Server Methods       #

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.3/micrOSDevToolKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.0.1
+Version: 3.0.3
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.3}/micrOSDevToolKit.egg-info/SOURCES.txt

@@ -178,8 +178,6 @@ toolkit/LM_to_compile.dat
 toolkit/MicrOSDevEnv.py
 toolkit/WebRepl.py
 toolkit/__init__.py
-toolkit/img_stream.html
-toolkit/index.html
 toolkit/micrOSdashboard.py
 toolkit/micrOSlint.py
 toolkit/socketClient.py
@@ -208,6 +206,9 @@ toolkit/dashboard_apps/_gyro_visualizer.py
 toolkit/dashboard_apps/_micPlotting.py
 toolkit/dashboard_apps/_presencePlotting.py
 toolkit/dashboard_apps/uLightDemo.py
+toolkit/gateway/gateway.css
+toolkit/gateway/img_stream.html
+toolkit/gateway/index.html
 toolkit/lib/LocalMachine.py
 toolkit/lib/MicrosFiles.py
 toolkit/lib/Repository.py

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.3}/setup.py

@@ -17,7 +17,7 @@ dependencies = ['adafruit-ampy', 'mpremote', 'esptool', 'ipaddress', 'netaddr',
 
 setuptools.setup(
     name='micrOSDevToolKit',
-    version='3.0.1',
+    version='3.0.3',
     author='Marcell Ban',
     author_email='miros.framework@gmail.com',
     description='Development and deployment environment for micrOS, the diy micropython automation OS (IoT)',

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.3}/toolkit/Gateway.py

@@ -3,12 +3,14 @@
 # using flask_restful
 import json
 import os
+import ipaddress
 from flask import Flask, jsonify, Response, make_response, request, send_file, abort
 from flask_restful import Resource, Api
 import threading
 import time
 import concurrent.futures
 MYPATH = os.path.dirname(__file__)
+WEBUI_PATH = os.path.join(MYPATH, 'gateway')
 import requests
 from io import BytesIO
 from socket import gethostbyname
@@ -35,6 +37,11 @@ API_URL_CACHE = ""
 # creating the flask app
 app = Flask(__name__)
 
+
+@app.route('/gateway.css')
+def gateway_css():
+    return send_file(os.path.join(WEBUI_PATH, 'gateway.css'), mimetype='text/css')
+
 # --------------------- AUTH BEGIN ------------------------- #
 ADDRESS_CACHE = {}
 try:
@@ -52,6 +59,8 @@ except Exception as e:
     print("[GW-AUTH][DISABLED] API_AUTH ENV VAR NOT FOUND.")
     __rest_usr_name, __rest_usr_pwd, ALLOWED_COUNTRY = None, None, []
 
+if (__rest_usr_name and __rest_usr_pwd) and BasicAuth is None:
+    raise RuntimeError("API_AUTH is configured, but flask_basicauth is not available")
 
 if BasicAuth is not None and (__rest_usr_name and __rest_usr_pwd):
     basic_auth = BasicAuth(app)
@@ -62,15 +71,16 @@ if BasicAuth is not None and (__rest_usr_name and __rest_usr_pwd):
     #app.config['BASIC_AUTH_PASSWORD'] = f'{__rest_usr_pwd}{datetime.now().day}'  # month-day (21)
 
     def _is_local_network():
-        # Define local network IP prefixes (adjust as needed)
-        local_network_prefixes = ['192.168.', '10.0.', '172.']
         #local_network_prefixes = []
         remote_ip = request.remote_addr
         print(f"\t[GW-AUTH] Check incoming IP address: {remote_ip}")
-        for prefix in local_network_prefixes:
-            if remote_ip.startswith(prefix):
-                print(f"\t\t[GW-AUTH] SKIP AUTH - LOCAL NETWORK: {prefix} match with {remote_ip}")
+        try:
+            remote_addr = ipaddress.ip_address(remote_ip)
+            if remote_addr.is_private or remote_addr.is_loopback:
+                print(f"\t\t[GW-AUTH] SKIP AUTH - LOCAL NETWORK: {remote_ip}")
                 return True, remote_ip
+        except ValueError:
+            print(f"\t\t[GW-AUTH] INVALID REMOTE IP: {remote_ip}")
         return False, remote_ip
 
 
@@ -142,7 +152,7 @@ class Hello(Resource):
     # is a GET request for this resource
 
     def get(self):
-        index_html = os.path.join(MYPATH, 'index.html')
+        index_html = os.path.join(WEBUI_PATH, 'index.html')
         try:
             with open(index_html, 'r') as file:
                 html = file.read()
@@ -185,6 +195,8 @@ class SendCmd(Resource):
         cmd_str = ' '.join(cmd_list)
 
         ip, port, fid, uid = socketClient.ConnectionData.select_device(device_tag=device)
+        if uid is None:
+            abort(404, description=f"Unknown device: {device}")
         device_detailed = (uid, ip, port, fid)
 
         print("[Gateway] Raw command params: --dev {} {}".format(uid, cmd_str))
@@ -322,7 +334,7 @@ class DeviceStatus(Resource):
 
             # Clean Alarms
             clean_alarms = DeviceStatus.CLEAN_MICROS_ALARMS
-            log_data = alarms.get('log', None)
+            log_data = alarms.get('log', None) if isinstance(alarms, dict) else None
             if clean_alarms and log_data and len(log_data) > 0:
                 _, _ = socketClient.run(['--dev', fuid.strip(), 'system alarms True'])
 
@@ -341,7 +353,7 @@ class DeviceStatus(Resource):
 
             # Get cpu temp
             _status4, cpu_temp = socketClient.run(['--dev', fuid.strip(), 'esp32 temp'])
-            if 'temp' in cpu_temp:
+            if isinstance(cpu_temp, str) and 'temp' in cpu_temp:
                 try:
                     cpu_temp = cpu_temp.split(":")[1].strip()
                 except:
@@ -352,6 +364,7 @@ class DeviceStatus(Resource):
         output_dev_struct = {}
         online_dev_cnt = 0
         device_struct = socketClient.ConnectionData.list_devices()
+        real_device_count = max(1, len(device_struct) - 2)
         dev_query_list = []
 
         # Start parallel status queries
@@ -362,7 +375,11 @@ class DeviceStatus(Resource):
 
         # Collect results from queries
         for query in dev_query_list:
-            node_info = query.result()
+            try:
+                node_info = query.result()
+            except Exception as e:
+                print(f"Node status worker error: {e}")
+                continue
 
             if node_info is None:
                 continue
@@ -372,7 +389,7 @@ class DeviceStatus(Resource):
             # Status calculation
             if status:
                 online_dev_cnt += 1
-                DeviceStatus.DEVS_AVAIL = round((online_dev_cnt / (len(device_struct)-2)) *100, 1)
+                DeviceStatus.DEVS_AVAIL = round((online_dev_cnt / real_device_count) * 100, 1)
                 status = 'HEALTHY'
             else:
                 status = 'UNHEALTHY'
@@ -574,7 +591,7 @@ class ImgStream(Resource):
     # is a GET request for this resource
 
     def get(self):
-        index_html = os.path.join(MYPATH, 'img_stream.html')
+        index_html = os.path.join(WEBUI_PATH, 'img_stream.html')
         try:
             with open(index_html, 'r') as file:
                 html = file.read()
@@ -620,6 +637,8 @@ api.add_resource(WebHook, '/webhooks', '/webhooks/<string:payload>', '/webhooks/
 
 
 def gateway(debug=True):
+    if (__rest_usr_name and __rest_usr_pwd) and BasicAuth is None:
+        raise RuntimeError("API_AUTH is set but flask_basicauth is unavailable. Refusing to start unsecured gateway.")
     global API_URL_CACHE
     API_URL_CACHE = f"http://{my_local_ip()}:5005"
     print("\n############### START MICROS GATEWAY ###############")