micrOSDevToolKit 3.6.4__tar.gz → 3.7.1__tar.gz

{microsdevtoolkit-3.6.4/micrOSDevToolKit.egg-info → microsdevtoolkit-3.7.1}/PKG-INFO

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

@@ -117,7 +117,7 @@
             0
         ],
         "modules/LM_web.py": [
-            8.52,
+            8.6,
             0
         ],
         "modules/LM_genIO.py": [
@@ -259,11 +259,11 @@
     },
     "summary": {
         "core": [
-            5485,
+            5488,
             27
         ],
         "load": [
-            6125,
+            6148,
             37
         ],
         "packages": [
@@ -272,8 +272,8 @@
             25
         ],
         "web": [
-            215999,
-            20
+            223188,
+            21
         ],
         "core_dep": [
             true,
@@ -285,6 +285,6 @@
         ],
         "core_score": 9.26,
         "load_score": 8.37,
-        "version": "3.6.4-0"
+        "version": "3.7.1-0"
     }
 }

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.1}/micrOS/source/Shell.py

@@ -28,7 +28,7 @@ IMAGE_MODE = 'rel' if 'micrOS' in uname()[-1] else 'dev'
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '3.6.4-0'
+    MICROS_VERSION = '3.7.1-0'
 
     def __init__(self):
         """

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.1}/micrOS/source/Tasks.py

@@ -605,6 +605,7 @@ def _exec_lm_core(cmd_list, jsonify):
     :param jsonify: request json output
     Return Bool(OK/NOK), Str(Command output)
     """
+    hint = "Shell: for hints type help.\nShell: for LM exec: [1](LM)module [2]function [3...]optional params"
 
     # LoadModule execution
     if len(cmd_list) >= 2:
@@ -615,18 +616,19 @@ def _exec_lm_core(cmd_list, jsonify):
             # [1] LOAD MODULE - OPTIMIZED by sys.modules
             if lm_mod not in modules:
                 exec(f"import {lm_mod}")
-            try:
-                # [2] EXECUTE FUNCTION FROM MODULE
-                lm_output = eval(f"{lm_mod}.{lm_func}({lm_params})")
-            except Exception as e:
-                # Handle not proper module load (simulator), note: module in sys.modules BUT not available
-                if lm_mod in str(e):
-                    # [2.1] LOAD MODULE - FORCED
-                    exec(f"import {lm_mod}")
-                    # [2.2] EXECUTE FUNCTION FROM MODULE
-                    lm_output = eval(f"{lm_mod}.{lm_func}({lm_params})")
-                else:
-                    raise e
+            # [2] IMPORT GUARD: Allow local functions and explicitly advertised commands.
+            module = modules[lm_mod]
+            func = getattr(module, lm_func)
+            if not callable(func):
+                return False, hint
+            if getattr(func, '__globals__', {}).get('__name__') != lm_mod:
+                help_func = getattr(module, 'help', None)
+                if help_func is None or not any(entry.split(' ', 1)[0] == lm_func
+                                                for entry in help_func()):
+                    return False, hint
+            # [3] Execute the checked callable, keeping its decorator active.
+            # Explicit locals also work in MicroPython and the CPython simulator.
+            lm_output = eval(f"_func({lm_params})", globals(), {'_func': func, lm_mod: module})
             # ------------ LM output format: dict(jsonify) / str(raw) ------------- #
             # Handle LM output data
             if isinstance(lm_output, dict):
@@ -635,7 +637,7 @@ def _exec_lm_core(cmd_list, jsonify):
                     [f" {key}: {value}" for key, value in lm_output.items()])
             if lm_func == 'help':
                 # Special case:
-                #   jsonify (True) json output, (False) default, "human readable" formatted output)
+                #   jsonify (True) json output, (False) default, "human-readable" formatted output
                 lm_output = dumps(lm_output) if jsonify else '\n'.join([f" {out}," for out in lm_output])
             # Return LM exec result
             return True, str(lm_output)
@@ -648,7 +650,7 @@ def _exec_lm_core(cmd_list, jsonify):
                 gcollect()
             # LM EXECUTION ERROR
             return False, f"Core error: {lm_mod}->{lm_func}: {e}"
-    return False, "Shell: for hints type help.\nShell: for LM exec: [1](LM)module [2]function [3...]optional params"
+    return False, hint
 
 
 def lm_is_loaded(lm_name):

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.1}/micrOS/source/modules/LM_sdcard.py

@@ -1,6 +1,6 @@
 from machine import SDCard
 from uos import mount, umount
-from Files import is_dir, path_join, list_fs, OSPath
+from Files import is_dir, path_join, list_fs, OSPath, abs_path
 
 STORAGE_PATH = path_join(OSPath.DATA, "storage")
 
@@ -41,7 +41,7 @@ def write_file(name, content):
     :param name: file name with type
     :param content: file text content
     """
-    target = path_join(STORAGE_PATH, name)
+    target = path_join(STORAGE_PATH, abs_path(name))
     try:
         with open(target, 'w') as f:
             f.write(content)
@@ -55,7 +55,7 @@ def read_file(name):
     Read a file
     :param name: file name with type
     """
-    target = path_join(STORAGE_PATH, name)
+    target = path_join(STORAGE_PATH, abs_path(name))
     try:
         with open(target, 'r') as f:
             return f.read()

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.1}/micrOS/source/modules/LM_web.py

@@ -10,6 +10,8 @@ from Common import web_endpoint, conf_dir, syslog
 from Config import cfgget, cfgput
 from Auth import sudo
 
+__MOUNTS_WA = None
+
 
 def load(dashboard:bool=None, fileserver:bool=None, fs_explore:bool=None, config:bool=None):
     """
@@ -31,22 +33,26 @@ def load(dashboard:bool=None, fileserver:bool=None, fs_explore:bool=None, config
     fileserver = wsc["fileserver"] if fileserver is None else fileserver
     fs_explore = wsc["fs_explore"] if fs_explore is None else fs_explore
     if fileserver:
+        global __MOUNTS_WA
         import LM_fileserver
         msg.append(LM_fileserver.load())
         msg.append(LM_fileserver.extend_mounts(modules=fs_explore, data=fs_explore, logs=fs_explore))
+        __MOUNTS_WA = LM_fileserver.mounts_write_access
     config = wsc["config"] if config is None else config
     if config:
         msg.append(enable_config())
 
     _web_apps('s', {"dashboard": dashboard,
-                                        "fileserver": fileserver, "fs_explore": fs_explore,
-                                        "config": config})
+                               "fileserver": fileserver, "fs_explore": fs_explore,
+                               "config": config})
     return msg
 
 
 def _web_apps(mode, conf=None):
     """
+    Stateful web application loading
     :param mode (str): s - save or r - read
+    :param conf (dict): dict to save at save mode
     """
     if mode == "s":
         if conf is None:
@@ -59,8 +65,10 @@ def _web_apps(mode, conf=None):
         except Exception as e:
             syslog(f"[WARN] Web app conf save: {e}")
             return False
-    # Load config (with fallback)
-    cfg = {"dashboard": True, "fileserver": False, "fs_explore": False, "config": True}
+    # Load config (with fallback) - default config
+    cfg = {"dashboard": True,
+           "fileserver": False, "fs_explore": False,
+           "config": True, "fs_write_access": {}}
     try:
         with open(conf_dir("webapps.json"), 'r') as f:
             cfg.update(conf_load(f))
@@ -69,11 +77,30 @@ def _web_apps(mode, conf=None):
     return cfg
 
 
-def status():
+def status(pwd=None) -> dict:
+    """
+    Web services status: dashboard, fileserver, fs_explore + write access [FSI], config
+    """
+    apps_status = _web_apps('r')
+    if (callable(__MOUNTS_WA) and apps_status.get("fileserver", False)
+            and apps_status.get("fs_explore", False)):
+        # requires password !
+        mounts_write_access = __MOUNTS_WA(pwd=pwd)
+        apps_status["fs_write_access"] = mounts_write_access
+    return apps_status
+
+
+def mounts_w_access(*args, **kwargs) -> dict:
     """
-    Web services status: dashboard, fileserver, fs_explore, config
+    [FSI] Fileserver write access control interface
+    input: modules:bool data:bool logs:bool pwd="<password>"
     """
-    return _web_apps('r')
+    apps_status = _web_apps('r')
+    if (callable(__MOUNTS_WA) and apps_status.get("fileserver", False)
+            and apps_status.get("fs_explore", False)):
+        # requires password !
+        return __MOUNTS_WA(*args, **kwargs)
+    return {}
 
 ######################## System Config ######################
 _CFG_HIDE = ("hwuid", "guimeta", "socport", "version", "auth", "soctout")
@@ -167,5 +194,6 @@ def help(widgets=False):
     """
     return ('load dashboard=True fileserver=False fs_explore=False config=True',
             'enable_config',
+            'mounts_w_access modules:bool=None data:bool=None logs:bool=None pwd=<password>',
             'status',
             'help')

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.1}/micrOS/source/web/config.js

@@ -9,12 +9,15 @@ const configCategories = {
   },
   'Web': {
     icon: '🌐',
-    keys: ['webui', 'webui_max_con']
+    keys: ['webui', 'webui_max_con'],
+    script: '/config_webapps.js',
+    render: 'renderWebAppsSection'
   },
   'Scheduler': {
     icon: '⏰',
     keys: ['cron', 'crontasks'],
-    render: loadSchedulerSection
+    script: '/config_schedler.js',
+    render: 'renderSchedulerSection'
   },
   'Interrupts': {
     icon: '⚡',
@@ -30,7 +33,8 @@ const configCategories = {
   },
   'Packages': {
     icon: '📦',
-    render: loadPackagesSection
+    script: '/config_packages.js',
+    render: 'renderPackagesSection'
   },
   'Debug': {
     icon: '🛠',
@@ -56,10 +60,6 @@ const configLabelMap = {
   'timirqcbf': 'Functions',
   'webui': 'Enable',
   'webui_max_con': 'Allowed Number of Connections',
-  'web.dashboard': 'Dashboard',
-  'web.fileserver': 'Fileserver',
-  'web.fs_explore': 'Fileserver > Show sys dirs',
-  'web.config': 'Config',
   'irq_prell_ms': 'Debounce (ms)',
 };
 const configSelectOptions = {
@@ -81,6 +81,23 @@ function configLabel(key) {
 let configData = {};
 let changedValues = {};
 let configSaving = false;
+const restEncodeMap = {
+  '"': '%5Cx22', "'": '%27', '#': '%23', '=': '%3D', '>': '%3E', '&': '%26',
+  '/': '%2F', '\\': '%5C%5C', ' ': '%20', '?': '%3F', '%': '%25'
+};
+
+function getAdminPassword() {
+  if (changedValues.hasOwnProperty('appwd')) {
+    return changedValues.appwd;
+  }
+  return configData.appwd || '';
+}
+
+/** Encode a value as one quoted REST argument for micrOS execution. */
+function restQuote(value) {
+  return '"' + String(value).replace(/["'#=>&/\\ ?%]/g, char => restEncodeMap[char]) + '"';
+}
+
 const configSectionScripts = {};
 const selectedCategoryKey = 'micros.config.selectedCategory';
 
@@ -296,8 +313,7 @@ async function handleUpdateConfig() {
     return;
   }
   const savedChanges = {...changedValues};
-  const nodeChanges = Object.fromEntries(Object.entries(savedChanges).filter(([key]) => !key.startsWith('web.')));
-  const appChanges = Object.fromEntries(Object.entries(savedChanges).filter(([key]) => key.startsWith('web.')));
+  const nodeChanges = savedChanges;
   configSaving = true;
   updateSaveButtonState();
   try {
@@ -316,18 +332,6 @@ async function handleUpdateConfig() {
       }
       commitConfigChanges(nodeChanges);
     }
-    if (Object.keys(appChanges).length) {
-      const args = Object.entries(appChanges)
-        .map(([key, value]) => `${encodeURIComponent(key.slice(4))}=${value ? 'True' : 'False'}`);
-      const response = await restAPI('web/load/' + args.join('/'), false);
-      if (!response || response.state !== true) throw new Error('Unable to update web app settings.');
-      const status = await restAPI('web/status', false);
-      if (!status || status.state !== true || !status.result ||
-          !Object.entries(appChanges).every(([key, value]) => status.result[key.slice(4)] === value)) {
-        throw new Error('Unable to confirm saved web app settings.');
-      }
-      commitConfigChanges(appChanges);
-    }
     showConfigSaveSuccess(savedChanges);
   } catch (error) {
     console.error('Update failed:', error);
@@ -357,6 +361,10 @@ function addMenuListeners() {
       closeMobileMenu();
       saveSelectedCategory(key);
       const category = configCategories[key] || {};
+      if (category.script) {
+        loadConfigSection(key);
+        return;
+      }
       if (typeof category.render === 'function') {
         category.render();
         return;
@@ -428,57 +436,9 @@ function renderConfigFields(data, sectionKey = '', renderFields = renderDefaultF
   } else {
     renderFields(data, container, sectionKey);
   }
-  if (sectionKey === 'Web') updateWebAppsVisibility(container);
   updateUnsavedFields();
 }
 
-function updateWebAppsVisibility(container) {
-  const enabled = (changedValues.webui ?? configData.webui) === true;
-  const group = container.querySelector('#configWebApps');
-  if (group) group.hidden = !enabled;
-  else if (enabled) renderWebApps(container);
-}
-
-function renderWebApps(container) {
-  const group = createConfigFieldset('Web apps');
-  group.id = 'configWebApps';
-  const fields = document.createElement('div');
-  const message = textElement('p', 'Loading web apps...');
-  message.setAttribute('role', 'status');
-  group.appendChild(fields);
-  group.appendChild(message);
-  group.appendChild(textElement('p', '[i] Disabling an app requires a reboot.'));
-  container.appendChild(group);
-
-  function render() {
-    fields.innerHTML = '';
-    const current = {...configData, ...changedValues};
-    Object.entries(current)
-      .filter(([key, value]) => key.startsWith('web.') && typeof value === 'boolean')
-      .sort(([a], [b]) => configLabel(a).localeCompare(configLabel(b), 'en'))
-      .forEach(([key, value]) => renderField(fields, key, value));
-    fields.querySelectorAll('[data-config-key="web.config"] button').forEach(button => { button.disabled = true; });
-    message.textContent = '';
-    updateUnsavedFields();
-  }
-
-  if (Object.keys(configData).some(key => key.startsWith('web.'))) {
-    render();
-    return;
-  }
-  restAPI('web/status', false)
-    .then(response => {
-      if (!response || response.state !== true || !response.result || typeof response.result !== 'object' || Array.isArray(response.result)) {
-        throw new Error('Unable to load web app settings.');
-      }
-      Object.entries(response.result).forEach(([key, value]) => {
-        if (typeof value === 'boolean') configData['web.' + key] = value;
-      });
-      render();
-    })
-    .catch(error => { message.textContent = error.message; });
-}
-
 function renderTaskSection() {
   const container = document.getElementById('configFields');
   container.innerHTML = '';
@@ -965,19 +925,17 @@ function fetchDeviceHealth(settings) {
     });
 }
 
-// Fetch optional config sections once, when first opened.
-function loadSchedulerSection() {
-  return loadConfigSection('scheduler', '/config_schedler.js', () => renderSchedulerSection());
-}
-
-function loadPackagesSection() {
-  return loadConfigSection('packages', '/config_packages.js', () => renderPackagesSection());
-}
-
-function loadConfigSection(name, src, render) {
+// Optional sections declare their script and renderer in configCategories.
+function loadConfigSection(category) {
+  const {script: src, render: renderer} = configCategories[category];
   const container = document.getElementById('configFields');
-  container.innerHTML = '';
-  const loading = textElement('p', `Loading ${name}...`);
+  // Base settings stay usable even when optional enhancements are unavailable.
+  renderConfigFields(filterConfig(category), category);
+  if (!isEditableConfigSection(category)) {
+    container.appendChild(textElement('h2', categoryTitle(category), 'config-heading-top'));
+  }
+  const loading = textElement('p', `Loading ${category.toLowerCase()} features...`);
+  loading.setAttribute('role', 'status');
   container.appendChild(loading);
   if (!configSectionScripts[src]) {
     configSectionScripts[src] = new Promise((resolve, reject) => {
@@ -987,7 +945,7 @@ function loadConfigSection(name, src, render) {
       script.onerror = () => {
         script.remove();
         delete configSectionScripts[src];
-        reject(new Error(`Failed to load ${name}.`));
+        reject(new Error(`Optional ${category.toLowerCase()} features are unavailable.`));
       };
       document.head.appendChild(script);
     });
@@ -995,12 +953,15 @@ function loadConfigSection(name, src, render) {
   return configSectionScripts[src]
     .then(() => {
       // Do not replace a different menu or a newer view while loading.
-      if (loading.isConnected) render();
+      if (!loading.isConnected) return;
+      const render = typeof renderer === 'function' ? renderer : window[renderer];
+      if (typeof render !== 'function') throw new Error(`Optional ${category.toLowerCase()} features are unavailable.`);
+      render();
     })
     .catch(err => {
       if (!loading.isConnected) return;
       loading.textContent = err.message;
-      container.appendChild(makeButton('Retry', () => loadConfigSection(name, src, render)));
+      container.appendChild(makeButton('Retry', () => loadConfigSection(category)));
     });
 }
 
@@ -1620,7 +1581,7 @@ function trackChange(key, value) {
   } else {
     changedValues[key] = value;
   }
-  if (key === 'webui') updateWebAppsVisibility(document.getElementById('configFields'));
+  if (key === 'webui' && typeof updateWebAppsVisibility === 'function') updateWebAppsVisibility(document.getElementById('configFields'));
   updateSaveButtonState();
   console.log('Changed config keys:', Object.keys(changedValues));
 }

{microsdevtoolkit-3.6.4 → microsdevtoolkit-3.7.1}/micrOS/source/web/config_packages.js

@@ -1,9 +1,5 @@
 // Loaded on demand by config.js when the Packages menu opens.
 let installedPackageNames = new Set();
-const restEncodeMap = {
-  '"': '%5Cx22', "'": '%27', '#': '%23', '=': '%3D', '>': '%3E', '&': '%26',
-  '/': '%2F', '\\': '%5C%5C', ' ': '%20', '?': '%3F', '%': '%25'
-};
 const PACMAN_TIMEOUT_MS = 20000;
 
 // Packages UI: install and inspect
@@ -250,18 +246,6 @@ function getPackageActions() {
   ];
 }
 
-function getAdminPassword() {
-  if (changedValues.hasOwnProperty('appwd')) {
-    return changedValues.appwd;
-  }
-  return configData.appwd || '';
-}
-
-/** Encode a value as one quoted REST argument for micrOS execution. */
-function restQuote(value) {
-  return '"' + String(value).replace(/["'#=>&/\\ ?%]/g, char => restEncodeMap[char]) + '"';
-}
-
 function loadPackageDetails(packageName, details, button) {
   if (details.style.display !== 'none' && details.textContent) {
     details.style.display = 'none';