micrOSDevToolKit 3.0.3__tar.gz → 3.0.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.0.3
+Version: 3.0.6
 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.3 → microsdevtoolkit-3.0.6}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -37,7 +37,7 @@
             13
         ],
         "Config.py": [
-            9.63,
+            9.62,
             17
         ],
         "Shell.py": [
@@ -49,7 +49,7 @@
             3
         ],
         "Types.py": [
-            8.54,
+            9.04,
             28
         ],
         "Logger.py": [
@@ -323,11 +323,11 @@
     },
     "summary": {
         "core": [
-            5306,
+            5311,
             27
         ],
         "load": [
-            8828,
+            8827,
             53
         ],
         "core_dep": [
@@ -338,8 +338,8 @@
             true,
             4
         ],
-        "core_score": 9.26,
+        "core_score": 9.28,
         "load_score": 8.44,
-        "version": "3.0.0-0"
+        "version": "3.0.6-0"
     }
 }

{microsdevtoolkit-3.0.3 → microsdevtoolkit-3.0.6}/micrOS/source/Config.py

@@ -14,7 +14,6 @@ Designed by Marcell Ban aka BxNxM
 #################################################################
 from re import search
 from json import load, dump
-from utime import sleep
 from Debug import DebugCfg, console_write, syslog
 from Files import OSPath, path_join, is_file
 from uos import remove, rename
@@ -142,7 +141,7 @@ class Config:
     @classmethod
     def _inject_default_conf(cls):
         # Load config and template
-        liveconf = cls.read_cfg_file(nosafe=True)
+        liveconf = cls.read_cfg_file()
         _persist = False
         # Remove obsolete keys from conf
         try:
@@ -166,43 +165,38 @@ class Config:
                         break
             if _persist:
                 # Only persist when migration cleanup removed keys or defaults are missing from the file.
-                cls.write_cfg_file()
-                console_write("[CONF] Save conf successful")
+                state = "successful" if cls.write_cfg_file() else "failed"
+                console_write(f"[CONF] Save conf {state}")
         except Exception as e:
             syslog(f"[ERR] Save (__inject) conf failed: {e}")
         finally:
             del liveconf
 
     @staticmethod
-    def read_cfg_file(nosafe=False):
-        conf = {}
-        while True:
+    def read_cfg_file():
+        if not is_file(Config.CONFIG_PATH):
+            return {}
+        try:
+            with open(Config.CONFIG_PATH, 'r') as f:
+                return load(f)
+        except Exception as e:
+            syslog(f'[ERR] read_cfg_file error: {e}')
             try:
-                with open(Config.CONFIG_PATH, 'r') as f:
-                    conf = load(f)
-                break
-            except Exception as e:
-                console_write(f"[CONF] read_cfg_file error {conf} (json): {e}")
-                # Write out initial config, if no config exists.
-                if nosafe:
-                    break
-                sleep(0.2)
-                syslog(f'[ERR] read_cfg_file error: {e}')
-        # Return config cache
-        return conf
+                rename(Config.CONFIG_PATH, f"{Config.CONFIG_PATH}.bad")
+                console_write(f"[CONF] Corrupted config moved: {Config.CONFIG_PATH}.bad")
+            except Exception as e2:
+                syslog(f'[ERR] read_cfg_file quarantine failed: {e2}')
+            return {}
 
     @staticmethod
     def write_cfg_file():
-        while True:
-            try:
-                # WRITE JSON CONFIG
-                with open(Config.CONFIG_PATH, 'w') as f:
-                    dump({key: value for key, value in Config.INSTANCE.items()}, f)
-                break
-            except Exception as e:
-                syslog(f'[ERR] write_cfg_file {Config.CONFIG_PATH} (json): {e}')
-            sleep(0.2)
-        return True
+        try:
+            with open(Config.CONFIG_PATH, 'w') as f:
+                dump({key: value for key, value in Config.INSTANCE.items()}, f)
+            return True
+        except Exception as e:
+            syslog(f'[ERR] write_cfg_file {Config.CONFIG_PATH}: {e}')
+            return False
 
     @staticmethod
     def type_handler(key, value):
@@ -251,16 +245,16 @@ class Config:
     def validate_pwd(password):
         """
         Validate appwd parameter
-        - webrepl password
+        - webrepl password (max 9 char)
         - micrOS auth password (Shell/WebCli)
-        - wifi access point password
+        - wifi access point password (WPA2-PSK)
         """
         # Check password rules
-        if 4 <= len(password) <= 9:
+        if 8 <= len(password) <= 9:
             if search(r"[A-Z]", password) and search(r"[a-z]", password):
                 if search(r"\d", password):
                     return True, ''
-        return False, 'Password must include [0-9] both [a-z][A-Z] and length between 4-9 char.'
+        return False, 'Password must include [0-9] both [a-z][A-Z] and length between 8-9 char.'
 
 
 #################################################################

{microsdevtoolkit-3.0.3 → microsdevtoolkit-3.0.6}/micrOS/source/Scheduler.py

@@ -43,7 +43,7 @@ def __cron_task_cache_manager(now_in_sec, sec_tolerant):
         tasktime_in_sec = int(str(taskid.split('|')[0]).split(':')[1])
         sec_diff = tasktime_in_sec - (now_in_sec - sec_tolerant)
         # Remove outdated cache registration
-        if sec_diff < 0 or sec_diff > 20:
+        if sec_diff < 0 or sec_diff > sec_tolerant * 2:
             LAST_CRON_TASKS.remove(LAST_CRON_TASKS[index])
 
 

{microsdevtoolkit-3.0.3 → microsdevtoolkit-3.0.6}/micrOS/source/Shell.py

@@ -25,7 +25,7 @@ from Debug import syslog
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '3.0.0-0'
+    MICROS_VERSION = '3.0.6-0'
 
     def __init__(self):
         """

{microsdevtoolkit-3.0.3 → microsdevtoolkit-3.0.6}/micrOS/source/Types.py

@@ -10,6 +10,8 @@ USAGE:
     SLIDER brightness br
     SLIDER brightness br=<0-100>
     SLIDER brightness br=<0-100-5>
+    GRAPH top
+    EMBED{"callback": "/cam/stream", "title": "live stream", "image": true}
 """
 from json import dumps, loads
 from Debug import syslog
@@ -18,18 +20,21 @@ from Debug import syslog
 #                 HELP TUPLE RESOLVER                  #
 ########################################################
 
-__TEMPLATE = {'type': 'n/a', 'lm_call': ''}
+__TEMPLATE = {'type': 'n/a', 'callback': ''}
 __RANGE_100 = {'range': (0, 100, 2)}
 __RANGE_255 = {'range': (0, 255, 2)}
 __OPTIONS = {'options': ("None",)}
 
-# Widget Types
-BUTTON = lambda: __TEMPLATE | {'type': 'button'} | __OPTIONS
-SLIDER = lambda: __TEMPLATE | {'type': 'slider'} | __RANGE_100
-TEXTBOX = lambda: __TEMPLATE | {'type': 'textbox', 'refresh': 10000}
-COLOR = lambda: __TEMPLATE | {'type': 'color'} | __RANGE_255
-WHITE = lambda: __TEMPLATE | {'type': 'white'} | __RANGE_255
-JOYSTICK = lambda: __TEMPLATE | {'type': 'joystick'} | __RANGE_100
+# Widget Types - Load Module Callbacks
+BUTTON = lambda: __TEMPLATE | {'type': 'button'} | __OPTIONS                        # pylint: disable=invalid-name
+SLIDER = lambda: __TEMPLATE | {'type': 'slider'} | __RANGE_100                      # pylint: disable=invalid-name
+TEXTBOX = lambda: __TEMPLATE | {'type': 'textbox', 'refresh': 10000}                # pylint: disable=invalid-name
+COLOR = lambda: __TEMPLATE | {'type': 'color'} | __RANGE_255                        # pylint: disable=invalid-name
+WHITE = lambda: __TEMPLATE | {'type': 'white'} | __RANGE_255                        # pylint: disable=invalid-name
+JOYSTICK = lambda: __TEMPLATE | {'type': 'joystick'} | __RANGE_100                  # pylint: disable=invalid-name
+GRAPH = lambda: __TEMPLATE | {'type': 'graph', 'refresh': 3000, 'limit': 30}        # pylint: disable=invalid-name
+# Widget Types - Web endpoints
+EMBED = lambda: __TEMPLATE | {'type': 'embed', 'image': False, 'retry': 3000, 'title': None}    # pylint: disable=invalid-name
 
 
 ########################################################
@@ -76,7 +81,7 @@ def _generate(type_dict, help_msg):
             else:
                 param_str = f'{p}=:{"range" if "range" in type_dict else "options"}:'
                 valid_params.append(param_str)
-    type_dict['lm_call'] = f"{func} {' '.join(valid_params)}"
+    type_dict['callback'] = f"{func} {' '.join(valid_params)}"
     return dumps(type_dict | overwrite)
 
 
@@ -127,15 +132,19 @@ def resolve(help_data, widgets=False):
                     # Apply inline widget-only overrides, e.g. TEXTBOX{'refresh': 5000}
                     resolved_tag.update(overrides)
                 try:
-                    # Build a clean message for _generate, without inline {...}
-                    cleaned_msg = (tag + ' ' + cmd).strip()
-                    # Generate JSON output with TAG
-                    help_msg.append(_generate(resolved_tag, cleaned_msg))
+                    if not cmd and isinstance(resolved_tag, dict):
+                        help_msg.append(dumps(resolved_tag))
+                    else:
+                        # Build a clean message for _generate, without inline {...}
+                        cleaned_msg = (tag + ' ' + cmd).strip()
+                        # Generate JSON output with TAG
+                        help_msg.append(_generate(resolved_tag, cleaned_msg))
                 except Exception as e:
                     syslog(f"[ERR] resolve {tag} help msg: {e}")
                 continue
             # Widgets OFF - TAG exists - remove TAG from output
-            help_msg.append(cmd.strip())
+            if tag not in ('EMBED',):
+                help_msg.append(cmd.strip())
         elif not widgets:
             # No TAG - Widgets OFF output
             help_msg.append(msg)

{microsdevtoolkit-3.0.3 → microsdevtoolkit-3.0.6}/micrOS/source/Web.py

@@ -199,7 +199,7 @@ class Buffer:
         return len(request)
 
     async def _response_handler(self, resp_handler):
-        if "closure" == type(resp_handler).__name__:
+        if type(resp_handler).__name__ in ("function", "closure"):
             for is_finished in resp_handler(self._send_buf):
                 await self._flush_response()
                 if is_finished:

{microsdevtoolkit-3.0.3 → microsdevtoolkit-3.0.6}/micrOS/source/modules/LM_OV2640.py

@@ -58,9 +58,7 @@ def _set_web_endpoints():
     # Register rest endpoint
     web_endpoint('cam/snapshot', _snapshot_clb)
     web_endpoint('cam/stream', _image_stream_clb)
-    web_endpoint('cam/photo', lambda _, body: \
-                 ('text/plain', photo() if not body else photo(body.encode('ascii'))))
-    return "Endpoint created: /cam/snapshot, /cam/stream, /cam/photo"
+    return "Endpoint created: /cam/snapshot, /cam/stream"
 
 
 def settings(quality=None, flip=None, mirror=None, effect=None, saturation=None, brightness=None, contrast=None, whitebalace=None, q=None):
@@ -242,12 +240,13 @@ def help(widgets=False):
     """
     return resolve(('load quality="medium/low/high" freq="default/high"',
         'settings quality=None flip=None mirror=None effect="NONE"',
+        'EMBED{"callback": "/cam/stream", "title": "camera stream", "image": true, "retry": 3000}',
         'SLIDER settings saturation=<0-100>',
         'SLIDER settings brightness=<0-100>',
         'SLIDER settings contrast=<0-100>',
         'BUTTON settings effect=<NONE,NEG,BW,RED,GREEN,BLUE,RETRO>',
         'capture',
-        'photo',
+        'BUTTON photo',
         'BUTTON flashlight state=None',
         '[Hint] after load you can access the /cam/snapshot and /cam/stream endpoints',
         'Thanks to :) https://github.com/lemariva/micropython-camera-driver'), widgets=widgets)

{microsdevtoolkit-3.0.3 → microsdevtoolkit-3.0.6}/micrOS/source/modules/LM_aht10.py

@@ -136,4 +136,4 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('TEXTBOX measure', 'reset', 'load', 'pinmap'), widgets=widgets)
+    return resolve(('GRAPH measure', 'reset', 'load', 'pinmap'), widgets=widgets)

{microsdevtoolkit-3.0.3 → microsdevtoolkit-3.0.6}/micrOS/source/modules/LM_bme280.py

@@ -349,5 +349,5 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('TEXTBOX{"refresh": 2000} measure ntfy=False',
+    return resolve(('GRAPH{"refresh": 2000} measure ntfy=False',
                              'load', 'pinmap'), widgets=widgets)

{microsdevtoolkit-3.0.3 → microsdevtoolkit-3.0.6}/micrOS/source/modules/LM_dht11.py

@@ -78,5 +78,5 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('TEXTBOX measure log=False',
+    return resolve(('GRAPH measure log=False',
                              'logger', 'load', 'pinmap'), widgets=widgets)

{microsdevtoolkit-3.0.3 → microsdevtoolkit-3.0.6}/micrOS/source/modules/LM_dht22.py

@@ -79,5 +79,5 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('TEXTBOX measure log=False',
+    return resolve(('GRAPH measure log=False',
                              'logger', 'load', 'pinmap'), widgets=widgets)

{microsdevtoolkit-3.0.3 → microsdevtoolkit-3.0.6}/micrOS/source/modules/LM_system.py

@@ -268,7 +268,7 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('info', 'TEXTBOX top', 'gclean', 'heartbeat', 'clock',
+    return resolve(('info', 'GRAPH{"refresh":5000} top', 'gclean', 'heartbeat', 'clock',
                     'setclock year month mday hour minute sec',
                     'ntp', 'rssi', 'list_stations', 'pinmap key="builtin"', 'alarms clean=False',
                     'notifications enable=<None,True,False>',

{microsdevtoolkit-3.0.3/toolkit/workspace/precompiled → microsdevtoolkit-3.0.6/micrOS/source}/web/dashboard.html

@@ -33,7 +33,6 @@
     </style>
     <script src="uapi.js" ></script>
     <script src="uwidgets.js" ></script>
-    <script src="uwidgets_pro.js" ></script>
     <script src="udashboard.js" ></script>
 </head>
 <body>

{microsdevtoolkit-3.0.3/toolkit/workspace/precompiled → microsdevtoolkit-3.0.6/micrOS/source}/web/udashboard.js

@@ -1,4 +1,35 @@
 // API HELPER FUNCTION - get module exposed widgets
+const OPTIONAL_WIDGET_TYPES = {
+    joystick: { src: 'uwidgets_pro.js', ready: () => typeof joystickWidget === 'function' },
+    embed: { src: 'uwidgets_pro.js', ready: () => typeof embedWidget === 'function' },
+    graph: { src: 'uwidgets_pro.js', ready: () => typeof graphWidget === 'function' }
+};
+const optionalWidgetLoaders = {};
+const normalizeCallback = callback => String(callback || '').trim().replace(/\s+/g, '/').replace(/^\/+/, '').replace(/\/+$/, '');
+
+function loadOptionalWidgetScript(src) {
+    if (optionalWidgetLoaders[src]) {
+        return optionalWidgetLoaders[src];
+    }
+    optionalWidgetLoaders[src] = new Promise((resolve, reject) => {
+        const script = document.createElement('script');
+        script.src = src;
+        script.onload = resolve;
+        script.onerror = () => reject(new Error(`Failed to load ${src}`));
+        document.head.appendChild(script);
+    });
+    return optionalWidgetLoaders[src];
+}
+
+function ensureOptionalWidgetsLoaded(widgets) {
+    const scripts = [...new Set(widgets
+        .map(({ type }) => OPTIONAL_WIDGET_TYPES[type])
+        .filter(Boolean)
+        .filter(({ ready }) => !ready())
+        .map(({ src }) => src))];
+    return scripts.length ? Promise.all(scripts.map(loadOptionalWidgetScript)) : Promise.resolve();
+}
+
 function moduleHelp(module) {
     const endpoint = `${module}/help/True`;
     console.log(`[API] Endpoint: ${endpoint}`);
@@ -24,11 +55,11 @@ function containerAppendChild(elements, container) {
         container.appendChild(element);});
 }
 
-function generateElement(type, module, lm_call="", options={}) {
+function generateElement(type, module, callback="", options={}) {
     // type: slider, button, box, h1, h2, p, li, etc.
     // data: rest command
     console.log(`type: ${type}`);
-    const data = `${module}/${lm_call}`;
+    const data = `${module}/${callback}`;
     console.log(`data: ${data}`);
     const container = document.getElementById(`container-${module}`);
     if(!container) {
@@ -48,7 +79,25 @@ function generateElement(type, module, lm_call="", options={}) {
         colorPaletteWidget(container, data, options)
     } else if (type === 'joystick') {
         // Create joystick widget
+        if (typeof joystickWidget !== 'function') {
+            console.error("Optional widget not loaded: joystick");
+            return;
+        }
         joystickWidget(container, data, options)
+    } else if (type === 'embed') {
+        // Create embedded image stream or webpage widget
+        if (typeof embedWidget !== 'function') {
+            console.error("Optional widget not loaded: embed");
+            return;
+        }
+        embedWidget(container, data, options)
+    } else if (type === 'graph') {
+        // Create graph widget
+        if (typeof graphWidget !== 'function') {
+            console.error("Optional widget not loaded: graph");
+            return;
+        }
+        graphWidget(container, data, options)
     } else {
         // Create other elements
         const element = document.createElement(type);
@@ -57,10 +106,10 @@ function generateElement(type, module, lm_call="", options={}) {
     }
 }
 
-function autoTitleLen(widgets, lm_call) {
+function autoTitleLen(widgets, callback) {
     try {
-        const func = lm_call.split('/')[0].split(' ')[0];
-        const count = widgets.reduce((accumulator, { lm_call }) => accumulator + (lm_call.split(' ')[0] === func ? 1 : 0), 0);
+        const func = normalizeCallback(callback).split('/')[0];
+        const count = widgets.reduce((accumulator, item) => accumulator + (normalizeCallback(item.callback).split('/')[0] === func ? 1 : 0), 0);
         return count > 1 ? 2 : 1;
     } catch (error) {
         console.error(error);
@@ -68,11 +117,16 @@ function autoTitleLen(widgets, lm_call) {
     }
 }
 
-function craftModuleWidgets(module, widgets) {
+async function craftModuleWidgets(module, widgets) {
     if (!widgets.length) {
         console.log(`${module} no exposed widgets`);
         return;
     }
+    try {
+        await ensureOptionalWidgetsLoaded(widgets);
+    } catch (error) {
+        console.error(`Error loading optional widgets for ${module}:`, error);
+    }
 
     console.log(`Craft widget to ${module}`);
     // Create HTML elements for widgets
@@ -85,17 +139,25 @@ function craftModuleWidgets(module, widgets) {
     generateElement('h2', module);
 
     const widgetTypeOptions = {
-        button: item => ({title_len: autoTitleLen(widgets, item.lm_call), options: item.options }),
-        slider: item => ({title_len: autoTitleLen(widgets, item.lm_call), range: item.range }),
-        color: item => ({title_len: autoTitleLen(widgets, item.lm_call), range: item.range }),
-        textbox: item => ({title_len: autoTitleLen(widgets, item.lm_call), refresh: item.refresh }),
-        joystick: item => ({title_len: autoTitleLen(widgets, item.lm_call), range: item.range })
+        button: item => ({title_len: autoTitleLen(widgets, item.callback), options: item.options }),
+        slider: item => ({title_len: autoTitleLen(widgets, item.callback), range: item.range }),
+        color: item => ({title_len: autoTitleLen(widgets, item.callback), range: item.range }),
+        textbox: item => ({title_len: autoTitleLen(widgets, item.callback), refresh: item.refresh }),
+        graph: item => ({title_len: autoTitleLen(widgets, item.callback), refresh: item.refresh, limit: item.limit }),
+        joystick: item => ({title_len: autoTitleLen(widgets, item.callback), range: item.range }),
+        embed: item => ({
+            title_len: item.callback ? Math.max(autoTitleLen(widgets, item.callback), 2) : 1,
+            callback: normalizeCallback(item.callback || ''),
+            image: item.image,
+            retry: item.retry,
+            title: item.title
+        })
     };
 
     // Create control elements for widget
     widgets.forEach(item => {
-        let { type, lm_call } = item;
-        lm_call = lm_call.replace(/\s/g, '/');
+        let { type, callback = '' } = item;
+        callback = normalizeCallback(callback);
         const type_options = widgetTypeOptions[type] ? widgetTypeOptions[type](item) : null;
         if (!type_options) {
             console.log(`Unsupported micrOS widget html_type: ${type}`);
@@ -104,7 +166,7 @@ function craftModuleWidgets(module, widgets) {
 
         try {
             console.log("adding widget controls");
-            generateElement(type, module, lm_call, type_options);
+            generateElement(type, module, callback, type_options);
         } catch (error) {
             console.error(error);
         }
@@ -116,7 +178,7 @@ function DynamicWidgetLoad() {
         const app_list = data.result;
         app_list.forEach(module => {
             moduleHelp(module).then(widgets => {
-                craftModuleWidgets(module, widgets);
+                return craftModuleWidgets(module, widgets);
             }).catch(error => {
                 console.error(`Error processing module ${module}:`, error);
             });

{microsdevtoolkit-3.0.3 → microsdevtoolkit-3.0.6}/micrOS/source/web/uwidgets.js

@@ -6,6 +6,13 @@ const windowWidth = window.innerWidth;
 function createTitle(command, title_len) {
     return command.split('/').slice(1, title_len + 1).join('-').replace(/=|:range:/g, '').replace(/=|:options:/g, '');
 }
+
+function toAbsoluteEndpoint(endpoint) {
+    if (!endpoint) {return '';}
+    if (/^https?:\/\//i.test(endpoint)) {return endpoint;}
+    return `${BASE_URL}/${endpoint.replace(/^\/+/, '')}`;
+}
+
 function paramPythonify(opt) {
     if (opt === "None" || opt === "True" || opt === "False") {return opt;}
     // Check if the input is a valid integer