micrOSDevToolKit 3.4.1__tar.gz → 3.5.0__tar.gz

{microsdevtoolkit-3.4.1/micrOSDevToolKit.egg-info → microsdevtoolkit-3.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.4.1
+Version: 3.5.0
 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.4.1 → microsdevtoolkit-3.5.0}/devToolKit.py

@@ -85,7 +85,7 @@ def arg_parse():
     dev_group.add_argument("-lint", "--linter", action="store_true", help="Run micrOS system linter (pylint+)")
     dev_group.add_argument("-webrepl", "--open_webrepl", action="store_true", help="(beta) Open webrepl in default browser, micropython repl + file transfers (built-in)")
     dev_group.add_argument("--light", action="store_true", help="Skip optional dependency deployments (low level param: add this as first argument always)")
-    dev_group.add_argument("-ut", "--unittest", action="store_true", help="Run micrOS unit tests - for development")
+    dev_group.add_argument("-ut", "--unittest", action="store_true", help="Run micrOS and toolkit unit tests - for development")
 
 
     toolkit_group = parser.add_argument_group("Toolkit development")
@@ -233,10 +233,27 @@ def update_pip_package():
 
 
 def run_unit_tests():
-    """Run micrOS Unit tests under micrOS/utests/*"""
+    """Run the micrOS runtime and host-side toolkit unit tests."""
     import unittest
-    suite = unittest.defaultTestLoader.discover("micrOS/utests")
-    unittest.TextTestRunner(verbosity=2).run(suite)
+
+    test_roots = (
+        ("micrOS RUNTIME TESTS", "micrOS/utests"),
+        ("DevToolKit HOST TESTS", "toolkit/tests"),
+    )
+
+    all_successful = True
+    for index, (title, test_dir) in enumerate(test_roots, start=1):
+        print("+--------------------------------------------------+")
+        print("| [{}/{}] {:<42} |".format(index, len(test_roots), title))
+        print("| ROOT: {:<42} |".format(test_dir))
+        print("+--------------------------------------------------+")
+        sys.stdout.flush()
+
+        suite = unittest.defaultTestLoader.discover(os.path.join(MYPATH, test_dir))
+        result = unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run(suite)
+        all_successful = result.wasSuccessful() and all_successful
+
+    return all_successful
 
 
 if __name__ == "__main__":
@@ -334,6 +351,6 @@ if __name__ == "__main__":
             executor.run_micro_script(cmd_args.macro)
 
     if cmd_args.unittest:
-        run_unit_tests()
+        sys.exit(0 if run_unit_tests() else 1)
 
     sys.exit(0)

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -29,7 +29,7 @@
             3
         ],
         "Web.py": [
-            9.36,
+            9.35,
             2
         ],
         "Tasks.py": [
@@ -261,7 +261,7 @@
             0
         ],
         "modules/LM_fileserver.py": [
-            9.27,
+            9.05,
             1
         ]
     },
@@ -280,7 +280,7 @@
             23
         ],
         "web": [
-            190266,
+            192178,
             18
         ],
         "core_dep": [
@@ -292,7 +292,7 @@
             5
         ],
         "core_score": 9.28,
-        "load_score": 8.36,
-        "version": "3.4.1-0"
+        "load_score": 8.35,
+        "version": "3.5.0-0"
     }
 }

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/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.4.1-0'
+    MICROS_VERSION = '3.5.0-0'
 
     def __init__(self):
         """

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/micrOS/source/Web.py

@@ -18,7 +18,7 @@ from io import BytesIO
 from uos import stat
 from Tasks import lm_exec, lm_is_loaded, TaskBase
 from Config import cfgget
-from Files import OSPath, path_join
+from Files import OSPath, path_join, abs_path
 from Buffer import SlidingBuffer, BufferFullError, MemoryPool
 from Debug import console_write, syslog
 from Auth import AuthRequired, PWD_KEY
@@ -36,13 +36,15 @@ def url_path_resolve(path:str) -> tuple[bool, str]:
     Return: isError, absolutePath
     """
     # $Extended mount check: WEB_MOUNTS (/modules and /web)
-    path = path.lstrip("/")
+    # Normalize the untrusted request path before joining it to a web root.
+    # This keeps parent-directory segments from escaping /web or a mount.
+    path = abs_path(path).lstrip("/")
     if path.startswith("$"):
         mount_alias = path.split("/")[0]
         mount_path = WebEngine.WEB_MOUNTS.get(mount_alias, None)
         if mount_path is None:
             return True, f"Invalid mount point: {mount_alias}"
-        mount_path = path.replace(mount_alias, mount_path)
+        mount_path = path.replace(mount_alias, mount_path, 1)
         return False, mount_path
     # Default web path: /web
     return False, path_join(OSPath.WEB, path)

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/micrOS/source/modules/LM_web.py

@@ -65,7 +65,7 @@ def _cfg_set_clb(_, body):
     """
     try:
         incoming_data = loads(body.decode('utf-8'))
-        print('Received config update request:', incoming_data)
+        print('Received config update keys:', tuple(incoming_data))
         failed_keys = []
         for k, v in incoming_data.items():
             try:

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/micrOS/source/web/auth.js

@@ -1,6 +1,6 @@
 (function () {
   var ID = 'micrOSAuth', rf = window.fetch && window.fetch.bind(window);
-  var user = 'admin', pass = '';
+  var user = 'admin', pass = '', challenged = {};
   try {
     sessionStorage.removeItem(ID);
     sessionStorage.removeItem('micros.config.auth');
@@ -27,6 +27,14 @@
       return a.protocol === location.protocol && a.host === location.host;
     } catch (_) { return false; }
   }
+  function key(i) {
+    try {
+      var a = document.createElement('a'), u = url(i);
+      if (!u || !same(i)) return '';
+      a.href = u;
+      return a.pathname;
+    } catch (_) { return ''; }
+  }
   function hdr(d) {
     d = d || load();
     return d.pass ? {'x-micros-auth': d.pass} : {};
@@ -59,9 +67,15 @@
   }
   function gf(u, o) {
     o = o || {};
-    return af(u, o).then(function (r) {
+    var k = key(u), d = load();
+    var proactive = o.micrOSAuth !== false && k && challenged[k] && d.pass;
+    return af(u, o, proactive ? d : null).then(function (r) {
       if (r.status !== 401 || o.micrOSAuth === false || !same(u)) return r;
-      var d = load();
+      challenged[k] = true;
+      if (proactive) {
+        clear();
+        return prompt({target: u, request: o, message: 'Auth required', ok: function (pr) { return pr; }});
+      }
       if (d.pass) {
         return af(u, o, d).then(function (rr) {
           if (rr.status !== 401) return rr;
@@ -102,6 +116,8 @@
             return;
           }
           save(n);
+          var k = key(t);
+          if (k) challenged[k] = true;
           if (o.ok) {
             rm(p);
             resolve(o.ok(r, n));

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/micrOS/source/web/config.js

@@ -2033,8 +2033,7 @@ function trackChange(key, value) {
     changedValues[key] = value;
   }
   updateSaveButtonState();
-  console.log('Tracked change:', key, '=', value);
-  console.log('All changes:', changedValues);
+  console.log('Changed config keys:', Object.keys(changedValues));
 }
 
 function toggleMenu() {

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/micrOS/source/web/index.html

@@ -47,12 +47,6 @@
           max-width:176px;
           min-width:0;
           padding:8px;
-
-          border:1px solid rgba(255,255,255,.16);
-          border-radius:8px;
-
-          background:rgba(0,0,0,.55);
-          box-shadow:0 2px 8px rgba(0,0,0,.20);
       }
 
       /* Main endpoint */
@@ -64,10 +58,10 @@
           width:100%;
           padding:6px 8px;
 
-          border:1px solid rgba(255,255,255,.16);
+          border:4px solid rgb(0, 0, 0);
           border-radius:6px;
 
-          background:rgba(255,255,255,.08);
+          background:rgba(0,0,0,.55);
           color:white;
 
           text-align:center;
@@ -96,6 +90,25 @@
           display:flex;
           flex-wrap:wrap;
           gap:8px;
+          justify-content:space-between;
+      }
+
+      .endpoint-group-actions[hidden] {
+          display:none;
+      }
+
+      .endpoint-children-toggle {
+          display:flex;
+          align-items:center;
+          justify-content:center;
+          min-height:0;
+          height:20px;
+          width:100%;
+          padding:0;
+          border:0;
+          background:transparent;
+          color:rgba(255, 255, 255, 0.55);
+          font-size:20px;
       }
 
       .endpoint-group button {
@@ -103,14 +116,21 @@
       }
 
       .endpoint-group-actions button {
+          min-width:47px;
           min-height:38px;
           padding:5px 8px;
+          background:rgba(0,0,0,.55);
+          border:2px solid rgb(0, 0, 0);
       }
 
-      @media (max-width:360px) {
+      @media (max-width: 768px) {
           .endpoint-group {
               flex-basis:126px;
           }
+
+          .endpoint-children-toggle {
+              font-size:12px;
+          }
       }
     </style>
     <script src="uapi.js" defer></script>

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/micrOS/source/web/uapi.js

@@ -5,7 +5,7 @@ let REST_CONSOLE_CACHE;
 
 function initializeBaseURL() {
     if (!BASE_URL && typeof window !== 'undefined') {
-        BASE_URL = `http://${window.location.hostname}${window.location.port ? `:${window.location.port}` : ""}`;
+        BASE_URL = window.location.origin;
     }
 }
 
@@ -102,7 +102,7 @@ function restInfo(showPages=true) {
             const endpoints = result['usr_endpoints'] ? Array.from(result['usr_endpoints']) : [];
             renderEndpointGroups(endpoints);
         }
-        document.getElementById('restInfoHeader').innerHTML = infoHeader;
+        document.getElementById('restInfoHeader').textContent = infoHeader;
     }).catch(error => {
         console.error('Error in restAPI:', error);
     });

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/micrOS/source/web/uapi_widgets.js

@@ -119,6 +119,27 @@ function endpointLabel(label, entry) {
     return icon ? `${icon} ${label}` : label;
 }
 
+function collapsibleToggle(label, content) {
+    const toggle = makeEl('button', {
+        className: 'endpoint-children-toggle',
+        type: 'button',
+        textContent: '\u25A0',
+        title: `Show ${label} endpoints`,
+        onclick: () => {
+            const expanded = toggle.getAttribute('aria-expanded') === 'true';
+            const action = expanded ? 'Show' : 'Hide';
+            toggle.setAttribute('aria-expanded', String(!expanded));
+            toggle.textContent = expanded ? '\u25A0' : '\u25C6';
+            toggle.title = `${action} ${label} endpoints`;
+            toggle.setAttribute('aria-label', toggle.title);
+            content.hidden = expanded;
+        }
+    });
+    toggle.setAttribute('aria-label', `Show ${label} endpoints`);
+    toggle.setAttribute('aria-expanded', 'false');
+    return toggle;
+}
+
 function renderEndpointGroups(endpoints) {
     const container = byId('endpointGroups');
     if (!container) {return;}
@@ -153,6 +174,11 @@ function renderEndpointGroups(endpoints) {
         const actions = makeEl('div', {className: 'endpoint-group-actions'});
         group.children.sort((a, b) => a.entry.localeCompare(b.entry))
             .forEach(({entry, label}) => actions.appendChild(button(endpointLabel(label, entry), entry)));
-        container.appendChild(makeEl('div', {className: 'endpoint-group'}, group.children.length ? [mainAction, actions] : [mainAction]));
+        const children = [mainAction];
+        if (group.children.length) {
+            actions.hidden = true;
+            children.push(collapsibleToggle(main, actions), actions);
+        }
+        container.appendChild(makeEl('div', {className: 'endpoint-group'}, children));
     });
 }

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/micrOS/utests/test_web_engine.py

@@ -81,6 +81,18 @@ def _install_import_stubs():
         pass
     m.OSPath = OSPathStub
     m.path_join = lambda *_a: os.path.join(*_a)
+    def abs_path(path):
+        stack = []
+        for part in path.split("/"):
+            if not part or part == ".":
+                continue
+            if part == "..":
+                if stack:
+                    stack.pop()
+            else:
+                stack.append(part)
+        return "/" + "/".join(stack)
+    m.abs_path = abs_path
     sys.modules["Files"] = m
 
     m = types.ModuleType("Config")
@@ -426,6 +438,22 @@ class TestWebStateMachine(unittest.TestCase):
         self.assertNotIn(b'<script src="/auth.js"></script>', response_head)
         self.assertEqual(response_handler.getvalue(), body)
 
+    def test_static_path_traversal_remains_under_web_root(self):
+        error, path = self.web_module.url_path_resolve("../config/node_config.json")
+
+        self.assertFalse(error)
+        self.assertEqual(path, "/web/config/node_config.json")
+
+    def test_mounted_path_traversal_falls_back_under_web_root(self):
+        self.web_module.WebEngine.WEB_MOUNTS["$data"] = "/data"
+        try:
+            error, path = self.web_module.url_path_resolve("$data/../config/node_config.json")
+        finally:
+            self.web_module.WebEngine.WEB_MOUNTS.pop("$data", None)
+
+        self.assertFalse(error)
+        self.assertEqual(path, "/web/config/node_config.json")
+
     def test_mounted_html_streams_without_rewrite(self):
         body = b"<html><head></head><body>User data</body></html>"
         self.web_module.WebEngine.WEB_MOUNTS["$data"] = "/data"

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0/micrOSDevToolKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.4.1
+Version: 3.5.0
 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.4.1 → microsdevtoolkit-3.5.0}/micrOSDevToolKit.egg-info/SOURCES.txt

@@ -36,10 +36,10 @@ micrOS/micropython/esp32s2-LOLIN_MINI-20251209-v1.27.0.bin
 micrOS/micropython/esp32s3-4MBflash-20241129-v1.24.1.bin
 micrOS/micropython/esp32s3-8MBflash-20251209-v1.27.0.bin
 micrOS/micropython/esp32s3_spiram_oct-20251209-v1.27.0.bin
-micrOS/micropython/micrOS-esp32-1.28.0-3.4.0-0.bin
-micrOS/micropython/micrOS-esp32c3-1.28.0-3.4.0-0.bin
-micrOS/micropython/micrOS-esp32c6-1.28.0-3.4.0-0.bin
-micrOS/micropython/micrOS-esp32s3-1.28.0-3.4.0-0.bin
+micrOS/micropython/micrOS-esp32-1.28.0-3.5.0-0.bin
+micrOS/micropython/micrOS-esp32c3-1.28.0-3.5.0-0.bin
+micrOS/micropython/micrOS-esp32c6-1.28.0-3.5.0-0.bin
+micrOS/micropython/micrOS-esp32s3-1.28.0-3.5.0-0.bin
 micrOS/micropython/rpi-pico-w-20251209-v1.27.0.uf2
 micrOS/micropython/tinypico-20251209-v1.27.0.bin
 micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json
@@ -339,6 +339,9 @@ toolkit/user_data/webhooks/generic.py
 toolkit/user_data/webhooks/macro.py
 toolkit/user_data/webhooks/template.macro
 toolkit/user_data/webhooks/template.py
+toolkit/user_data/webhooks/__pycache__/generic.cpython-312.pyc
+toolkit/user_data/webhooks/__pycache__/macro.cpython-312.pyc
+toolkit/user_data/webhooks/__pycache__/template.cpython-312.pyc
 toolkit/workspace/__init__.py
 toolkit/workspace/precompiled/Auth.mpy
 toolkit/workspace/precompiled/Buffer.mpy

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/setup.py

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

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/toolkit/dashboard_apps/SystemTest.py

@@ -19,6 +19,7 @@ import requests
 
 CLIENT = None
 TIMEOUT_SEC = 5
+RESULT_CONTINUATION = " " * 51
 
 # COLLECT AND SAVE SYSTEM TEST METRICS
 ENABLE_DATA_COLLECTION = os.environ.get("ENABLE_DATA_COLLECTION", False)
@@ -369,18 +370,40 @@ def micros_alarm_check():
             return _micros_alarm_legacy_report(info, alarm_data)
         return False, info + f" invalid alarm response: {output[1]}"
     if not isinstance(alarm_data.get('health'), bool):
-        return False, info + f" missing bool health: {alarm_data}"
+        return False, info + " missing bool health:\n" + _format_alarm_dump(alarm_data)
     verdict = alarm_data.get('verdict', '')
     if not isinstance(verdict, str) or not verdict.startswith(('OK alarm:', 'NOK alarm:')):
-        return False, info + f" invalid verdict: {alarm_data}"
+        return False, info + " invalid verdict:\n" + _format_alarm_dump(alarm_data)
     log_data = {key: value for key, value in alarm_data.items() if key not in ('health', 'verdict')}
     if any(key in ('log', 'path', 'text') or not isinstance(value, str) for key, value in log_data.items()):
-        return False, info + f" invalid dump: {alarm_data}"
+        return False, info + " invalid dump:\n" + _format_alarm_dump(alarm_data)
     # Clean alarms after evaluation.
     CLIENT.execute(['system alarms clean=True'])
+    formatted_dump = _format_alarm_dump(alarm_data)
     if not alarm_data['health']:
-        return True, info + f" !!!WARN!!! {verdict} out: {alarm_data}"
-    return True, info + f" {verdict} out: {alarm_data}"
+        return True, info + f" !!!WARN!!! {verdict}\n{formatted_dump}"
+    return True, info + f" {verdict}\n{formatted_dump}"
+
+
+def _format_alarm_dump(alarm_data):
+    """Format alarm metadata and multiline logs for the result console."""
+    lines = [
+        "Alarm dump:",
+        "  health: {}".format(alarm_data.get('health', '<missing>')),
+        "  verdict: {}".format(alarm_data.get('verdict', '<missing>')),
+    ]
+    for path, content in alarm_data.items():
+        if path in ('health', 'verdict'):
+            continue
+        lines.append("  {}:".format(path))
+        if isinstance(content, str):
+            log_lines = content.rstrip('\n').splitlines()
+            lines.extend("    {}".format(line) for line in log_lines)
+            if not log_lines:
+                lines.append("    <empty>")
+        else:
+            lines.append("    {!r}".format(content))
+    return RESULT_CONTINUATION + ("\n" + RESULT_CONTINUATION).join(lines)
 
 
 def _is_obsolete_alarm_api(output):

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/toolkit/lib/micrOSClient.py

@@ -217,7 +217,10 @@ class micrOSClient:
         # Collect answer data
         if select.select([self.conn], [], [], read_timeout)[0]:
             while True:
-                incoming_data = self.conn.recv(4096).decode('utf-8')
+                incoming_bytes = self.conn.recv(4096)
+                if not incoming_bytes:
+                    raise ConnectionError("Device disconnected before sending the command prompt")
+                incoming_data = incoming_bytes.decode('utf-8')
                 if stream:
                     incoming_data = incoming_data.replace(self.prompt, f"{color.NC}{color.BOLD}{self.prompt}{color.NC}")
                     print(f"\r{color.LIGHT_GRAY}{incoming_data}{color.NC}", end="")
@@ -314,15 +317,19 @@ class micrOSClient:
         for cnt in range(0, retry):
             try:
                 out = self.send_cmd(cmd, timeout, stream=stream)
-                if out is None or isinstance(out, list):
-                    break
+                if out is not None:
+                    return out
             except OSError as e:
-                    self.dbg_print("Host is down, timed out: {} sec e: {}".format(timeout, e))
-                    break
+                self.dbg_print("Host is down, timed out: {} sec e: {}".format(timeout, e))
             except Exception as e:
-                if "Bye!" in str(e):
-                    self.dbg_print("[Count] Send retry: {}/{}".format(cnt+1, retry))
-            time.sleep(0.2)
+                self.dbg_print("Send command failed: {}".format(e))
+
+            # A failed send closes the connection in send_cmd(). Ensure other
+            # failure paths reconnect as well before the next attempt.
+            self.close()
+            if cnt + 1 < retry:
+                self.dbg_print("[Count] Send retry: {}/{}".format(cnt + 1, retry))
+                time.sleep(0.2)
         return out
 
     def telnet(self, timeout=5):

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/toolkit/workspace/precompiled/web/auth.js

@@ -1,20 +1,22 @@
-(function(){var ID='micrOSAuth',rf=window.fetch&&window.fetch.bind(window);var user='admin',pass='';try{sessionStorage.removeItem(ID);sessionStorage.removeItem('micros.config.auth');}catch(_){}
+(function(){var ID='micrOSAuth',rf=window.fetch&&window.fetch.bind(window);var user='admin',pass='',challenged={};try{sessionStorage.removeItem(ID);sessionStorage.removeItem('micros.config.auth');}catch(_){}
 function rm(e){if(e&&e.parentNode)e.parentNode.removeChild(e);}
 function load(){return{user:user,pass:pass};}
 function save(d){user=d.user||'admin';pass=d.pass||'';return load();}
 function clear(){pass='';}
 function url(i){return typeof i==='string'?i:i&&typeof i.href==='string'?i.href:i&&typeof i.url==='string'?i.url:'';}
 function same(i){try{var a=document.createElement('a'),u=url(i);if(!u)return false;a.href=u;return a.protocol===location.protocol&&a.host===location.host;}catch(_){return false;}}
+function key(i){try{var a=document.createElement('a'),u=url(i);if(!u||!same(i))return'';a.href=u;return a.pathname;}catch(_){return'';}}
 function hdr(d){d=d||load();return d.pass?{'x-micros-auth':d.pass}:{};}
 function ext(a,b){var o={},k;a=a||{};for(k in a)o[k]=a[k];for(k in b)o[k]=b[k];return o;}
 function mh(a,b){var k,o={};if(window.Headers){try{o=new Headers(a||{});for(k in b)o.set(k,b[k]);return o;}catch(_){}}
 a=a||{};for(k in a)o[k]=a[k];for(k in b)o[k]=b[k];return o;}
 function af(u,o,d){o=o||{};if(!rf)return Promise.reject(Error('Fetch unsupported'));return rf(u,ext(o,{headers:mh(o.headers||(u&&u.headers),same(u)&&d?hdr(d):{})}));}
-function gf(u,o){o=o||{};return af(u,o).then(function(r){if(r.status!==401||o.micrOSAuth===false||!same(u))return r;var d=load();if(d.pass){return af(u,o,d).then(function(rr){if(rr.status!==401)return rr;clear();return prompt({target:u,request:o,message:'Auth required',ok:function(pr){return pr;}});});}
+function gf(u,o){o=o||{};var k=key(u),d=load();var proactive=o.micrOSAuth!==false&&k&&challenged[k]&&d.pass;return af(u,o,proactive?d:null).then(function(r){if(r.status!==401||o.micrOSAuth===false||!same(u))return r;challenged[k]=true;if(proactive){clear();return prompt({target:u,request:o,message:'Auth required',ok:function(pr){return pr;}});}
+if(d.pass){return af(u,o,d).then(function(rr){if(rr.status!==401)return rr;clear();return prompt({target:u,request:o,message:'Auth required',ok:function(pr){return pr;}});});}
 return prompt({target:u,request:o,message:'Auth required',ok:function(rr){return rr;}});});}
 function css(){if(document.getElementById(ID+'Style'))return;var s=document.createElement('style');s.id=ID+'Style';s.textContent='#'+ID+'{position:fixed;top:0;right:0;bottom:0;left:0;z-index:9999;display:flex;align-items:center;justify-content:center;background:#0009;font:14px sans-serif;color:#fff}#'+ID+' form{display:flex;flex-direction:column;width:240px;max-width:90%;padding:14px;border:1px solid #555;border-radius:6px;background:#161022}#'+ID+' input,#'+ID+' button{display:block;width:100%;min-width:0;max-width:none;flex:none;height:32px;min-height:32px;margin:8px 0 0;border-radius:4px;border:1px solid #555;padding:0 9px;box-sizing:border-box;font:14px sans-serif}#'+ID+' input{background:#241a36;color:#fff;font-size:16px}#'+ID+' button{background:#17823a;color:#fff;font-weight:bold}#'+ID+' span{min-height:18px;margin-top:6px;color:#ff9a9a}#'+ID+' pre{white-space:pre-wrap;word-break:break-word}';(document.head||document.getElementsByTagName('head')[0]).appendChild(s);}
 function prompt(o){o=o||{};css();rm(document.getElementById(ID));var d=load(),p=document.createElement('div'),f,e,m,t;p.id=ID;p.innerHTML='<form><strong>micrOS Auth</strong><input name="user" autocomplete="username" placeholder="Username"><input name="pass" type="password" autocomplete="current-password" placeholder="Password"><button>Unlock</button><span></span></form>';f=p.getElementsByTagName('form')[0];e=f.elements;m=p.getElementsByTagName('span')[0];t=o.target||location.pathname;e.user.value=d.user||'admin';m.textContent=o.message||'';return new Promise(function(resolve,reject){f.onsubmit=function(ev){ev.preventDefault();var n={user:e.user.value||'admin',pass:e.pass.value||''};af(t,o.request||{},n).then(function(r){if(r.status===401){m.textContent='Access denied';return;}
-save(n);if(o.ok){rm(p);resolve(o.ok(r,n));return;}
+save(n);var k=key(t);if(k)challenged[k]=true;if(o.ok){rm(p);resolve(o.ok(r,n));return;}
 r.text().then(function(body){if((r.headers.get('content-type')||'').indexOf('text/html')>=0){document.open();document.write(body);document.close();}else{p.removeAttribute('id');p.innerHTML='<pre></pre>';p.getElementsByTagName('pre')[0].textContent=body;}
 resolve(r);});}).catch(function(err){m.textContent='Request failed';reject(err);});};document.body.appendChild(p);e.pass.focus();});}
 function ready(fn){if(document.body)fn();else document.addEventListener('DOMContentLoaded',fn);}

{microsdevtoolkit-3.4.1 → microsdevtoolkit-3.5.0}/toolkit/workspace/precompiled/web/config.js

@@ -190,7 +190,7 @@ if(trigKey in groupData){const wrapper=document.createElement('div');wrapper.cla
 if(cbfKey in groupData){renderMultiParamField(groupWrapper,cbfKey,groupData[cbfKey]);}
 container.appendChild(groupWrapper);}
 function trackChange(key,value){if(configData[key]===value){delete changedValues[key];}else{changedValues[key]=value;}
-updateSaveButtonState();console.log('Tracked change:',key,'=',value);console.log('All changes:',changedValues);}
+updateSaveButtonState();console.log('Changed config keys:',Object.keys(changedValues));}
 function toggleMenu(){const menu=document.getElementById('configMenu');if(!menu)return;menu.classList.toggle('open');}
 function closeMenuOnOutsideClick(event){const menu=document.getElementById('configMenu');const toggle=document.getElementById('menuToggle');if(!menu||!menu.classList.contains('open')||window.innerWidth>768)return;if(menu.contains(event.target)||(toggle&&toggle.contains(event.target)))return;closeMobileMenu();}
 function initializeConfigUi(){addMenuListeners();const toggle=document.getElementById('menuToggle');if(toggle&&!toggle.dataset.bound){toggle.addEventListener('click',toggleMenu);toggle.dataset.bound='1';}