micrOSDevToolKit 2.9.1__py3-none-any.whl → 2.9.4__py3-none-any.whl

micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -13,7 +13,7 @@
             1
         ],
         "Server.py": [
-            9.52,
+            9.5,
             3
         ],
         "Web.py": [
@@ -45,7 +45,7 @@
             29
         ],
         "Logger.py": [
-            8.78,
+            8.75,
             4
         ],
         "Common.py": [
@@ -315,7 +315,7 @@
     },
     "summary": {
         "core": [
-            3276,
+            3274,
             23
         ],
         "load": [
@@ -332,6 +332,6 @@
         ],
         "core_score": 9.06,
         "load_score": 8.22,
-        "version": "2.9.1-0"
+        "version": "2.9.4-0"
     }
 }

micrOS/source/Common.py

@@ -210,7 +210,7 @@ def data_logger(f_name, data=None, limit=12, msgobj=None):
 
 def syslog(msg):
     """ Wrapper of errlog_add """
-    return errlog_add(f"[U] {msg}")
+    return errlog_add(f"{msg}")
 
 
 def console(msg):

micrOS/source/Logger.py

@@ -6,6 +6,7 @@ Designed by Marcell Ban aka BxNxM
 """
 from time import localtime
 from os import listdir, remove
+from re import match
 
 #############################################
 #        LOGGING WITH DATA ROTATION         #
@@ -66,6 +67,8 @@ def log_get(f_name, msgobj=None):
     """
     err_cnt = 0
     try:
+        if msgobj is not None:
+            msgobj(f_name)
         with open(f_name, 'r') as f:
             eline = f.readline().strip()
             while eline:
@@ -73,7 +76,7 @@ def log_get(f_name, msgobj=None):
                 err_cnt += 1 if "[ERR]" in eline else 0
                 # GIVE BACK .log file contents
                 if msgobj is not None:
-                    msgobj(eline)
+                    msgobj(f"\t{eline}")
                 eline = f.readline().strip()
     except:
         pass
@@ -82,8 +85,13 @@ def log_get(f_name, msgobj=None):
 
 def syslog(data=None, msgobj=None):
     if data is None:
-        return log_get('err.log', msgobj)
-    return logger(data, 'err.log', limit=6)
+        err_cnt = sum([log_get(f, msgobj) for f in listdir() if f.endswith(".sys.log")])
+        return err_cnt
+
+    _match = match(r"^\[([^\[\]]+)\]", data)
+    log_lvl = _match.group(1).lower() if _match else 'user'
+    f_name = f"{log_lvl}.sys.log" if log_lvl in ("err", "warn", "boot") else 'user.sys.log'
+    return logger(data, f_name, limit=4)
 
 
 def log_clean(msgobj=None):

micrOS/source/Server.py

@@ -114,7 +114,7 @@ class Client:
             console_write("[Client] NoCon: response>dev/nul")
 
     def send(self, response):
-        # Implement in child class - synchronous send method
+        # Implement in child class - synchronous send (all) method
         pass
 
     async def close(self):
@@ -196,7 +196,9 @@ class ShellCli(Client, Shell):
 
     def send(self, response):
         """
-        Send response to client with non-async function
+        Synchronous send function (with drain task)
+        - not used in Shell or ShellCli
+        - Note: it is a support function for synchronous scenarios: Server.reply_all
         """
         if self.connected:
             if self.prompt() != response:
@@ -219,8 +221,7 @@ class ShellCli(Client, Shell):
 
     async def __wait_for_drain(self):
         """
-        Handle drain serialization
-        - solve output data duplicate
+        Handle drain serialization - for synchronous send function
         """
         try:
             # send write buffer
@@ -233,55 +234,45 @@ class ShellCli(Client, Shell):
         # set drain free
         self.drain_event.set()                  # set drain free (True)
 
-    async def close(self):
-        Client.console(f"[ShellCli] Close connection {self.client_id}")
-        self.send("Bye!\n")
-        # Reset shell state machine
-        self.reset()
-        await asyncio.sleep_ms(50)
-        # Used from Client parent class
-        await super().close()
-
-    async def __shell_cmd(self, request):
+    async def a_send(self, response, encode='utf8'):
         """
-        Handle micrOS shell commands
+        Async send for Shell (new line + prompt$)
         """
-        # Run micrOS shell with request string
-        try:
-            # Handle micrOS shell
-            Client.console("[ShellCli] --- #Run shell")
-            state = self.shell(request)
-            if state:
-                return False      # exit_loop
-            return True           # exit_loop : Close session when shell returns False (auth Failed, etc.)
-        except Exception as e:
-            Client.console(f"[ShellCli] Shell exception: {e}")
-            if "ECONNRESET" in str(e):
-                return True       # exit_loop
-        self.send("[HA] Critical error - disconnect & hard reset")
-        errlog_add("[ERR] Socket critical error - reboot")
-        self.reboot()
+        if self.prompt() != response:
+            # [format] Add new line if not prompt
+            response = f"{response}\n"
+        await super().a_send(response, encode)
 
     async def run_shell(self):
         # Update server task output
         Manager().server_task_msg(','.join(list(Client.ACTIVE_CLIS)))
         # Init prompt
-        self.send(self.prompt())
+        await self.a_send(self.prompt())
         # Run async connection handling
+        _exit = False
         while self.connected:
             try:
                 # Read request msg from client
                 state, request = await self.read()
                 if state:
                     break
-                _exit = await self.__shell_cmd(request)
-                if _exit:
-                    collect()
-                    break
+                # Run micrOS shell with request string
+                Client.console("[ShellCli] --- #Run shell")
+                # Shell -> True (OK) or False (NOK) -> NOK->Close session (auth Failed, etc.)
+                _exit = not await self.shell(request)
             except Exception as e:
-                errlog_add(f"[ERR] handle_client: {e}")
+                errlog_add(f"[ERR] Shell client: {e}")
+                if "ECONNRESET" in str(e):
+                    _exit = True  # exit_loop
+                else:
+                    await self.a_send("[HA] Critical error - disconnect & hard reset")
+                    errlog_add("[ERR] Socket critical error - reboot")
+                    await self.reboot()
+            if _exit:
+                collect()
                 break
         # Close connection
+        await self.a_send("Bye!")
         await self.close()
 
 
@@ -418,7 +409,7 @@ class Server:
         """
         for _, cli in Client.ACTIVE_CLIS.items():
             if cli.connected:
-                cli.send(msg)
+                cli.send(f"~~~ {msg}")
 
     def __del__(self):
         Client.console("[ socket server ] <<destructor>>")

micrOS/source/Shell.py

@@ -25,7 +25,7 @@ from Debug import errlog_add
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '2.9.1-0'
+    MICROS_VERSION = '2.9.4-0'
 
     def __init__(self):
         """
@@ -45,10 +45,8 @@ class Shell:
         except Exception as e:
             errlog_add(f"[ERR] micrOS version export failed (config): {e}")
 
-    def send(self, msg):
-        """
-        Must be defined by child class...
-        """
+    async def a_send(self, msg):
+        """ Must be defined by parent class... """
         pass
 
     def reset(self):
@@ -56,44 +54,43 @@ class Shell:
         self.__auth_ok = False
         self.__conf_mode = False
 
-    def reboot(self, hard=False):
-        """Reboot micropython VM"""
-        self.send(f"{'[HARD] ' if hard else ''}Reboot micrOS system.")
-        self.send("Bye!")
+    async def reboot(self, hard=False):
+        """ Reboot micropython VM """
+        await self.a_send(f"{'[HARD] ' if hard else ''}Reboot micrOS system.\nBye!")
         if hard:
             hard_reset()
         soft_reset()
 
     def prompt(self):
-        """Generate prompt"""
+        """ Generate prompt """
         auth = "[password] " if self.__auth_mode and not self.__auth_ok else ""
         mode = "[configure] " if self.__conf_mode else ""
         return f"{auth}{mode}{self.__devfid} $ "
 
-    def __auth(self, msg_list):
-        """Authorize user"""
+    async def __auth(self, msg_list):
+        """ Authorize user """
         # Set user auth state
         if self.__auth_mode and not self.__auth_ok:
             # check password
             usrpwd = cfgget('appwd')
             if usrpwd == msg_list[0].strip():
                 self.__auth_ok = True
-                self.send("AuthOk")
+                await self.a_send("AuthOk")
                 return True, []
-            self.send("AuthFailed\nBye!")
+            await self.a_send("AuthFailed\nBye!")
             return False, []
         return True, msg_list
 
-    def shell(self, msg):
+    async def shell(self, msg):
         """
         micrOS Shell main - input string handling
         :param msg: incoming shell command (command or load module call)
         """
-        state = self.__shell(msg)
-        self.send(self.prompt())
+        state = await self.__shell(msg)
+        await self.a_send(self.prompt())
         return state
 
-    def __shell(self, msg):
+    async def __shell(self, msg):
         """
         Socket server - interpreter shell
         :param msg: socket input string
@@ -118,11 +115,11 @@ class Shell:
         # Hello message
         if msg_list[0] == 'hello':
             # For low level device identification - hello msg
-            self.send(f"hello:{self.__devfid}:{self.__hwuid}")
+            await self.a_send(f"hello:{self.__devfid}:{self.__hwuid}")
             return True
 
         # [!] AUTH
-        state, msg_list = self.__auth(msg_list)
+        state, msg_list = await self.__auth(msg_list)
         if not state:
             return False
         if len(msg_list) == 0:
@@ -131,7 +128,7 @@ class Shell:
         # Version handling
         if msg_list[0] == 'version':
             # For micrOS system version info
-            self.send(str(Shell.MICROS_VERSION))
+            await self.a_send(str(Shell.MICROS_VERSION))
             return True
 
         # Reboot micropython VM
@@ -140,12 +137,12 @@ class Shell:
             if len(msg_list) >= 2 and "-h" in msg_list[1]:
                 # reboot / reboot -h
                 hard = True
-            self.reboot(hard)
+            await self.reboot(hard)
 
         if msg_list[0].startswith('webrepl'):
             if len(msg_list) == 2 and '-u' in msg_list[1]:
-                Shell.webrepl(msg_obj=self.send, update=True)
-            Shell.webrepl(msg_obj=self.send)
+                await Shell.webrepl(msg_obj=self.a_send, update=True)
+            return await Shell.webrepl(msg_obj=self.a_send)
 
         # CONFIGURE MODE STATE: ACCESS FOR NODE_CONFIG.JSON
         if msg_list[0].startswith('conf'):
@@ -157,34 +154,34 @@ class Shell:
 
         # HELP MSG
         if msg_list[0] == "help":
-            self.send("[MICROS]   - built-in shell commands")
-            self.send("   hello   - hello msg - for device identification")
-            self.send("   modules - show active Load Modules")
-            self.send("   version - returns micrOS version")
-            self.send("   exit    - exit from shell socket prompt")
-            self.send("   reboot  - system soft reboot (vm), hard reboot (hw): reboot -h")
-            self.send("   webrepl - start webrepl, for file transfers use with --update")
-            self.send("[CONF] Configure mode - built-in shell commands")
-            self.send("  conf       - Enter conf mode")
-            self.send("    dump       - Dump all data")
-            self.send("    key        - Get value")
-            self.send("    key value  - Set value")
-            self.send("  noconf     - Exit conf mode")
-            self.send("[TASK] postfix: &x - one-time,  &&x - periodic, x: wait ms [x min: 20ms]")
-            self.send("  task list         - list tasks with <tag>s")
-            self.send("  task kill <tag>   - stop task")
-            self.send("  task show <tag>   - show task output")
-            self.send("[EXEC] Command mode (LMs):")
-            self.send("   help lm  - list ALL LoadModules")
+            await self.a_send("[MICROS]   - built-in shell commands")
+            await self.a_send("   hello   - hello msg - for device identification")
+            await self.a_send("   modules - show active Load Modules")
+            await self.a_send("   version - returns micrOS version")
+            await self.a_send("   exit    - exit from shell socket prompt")
+            await self.a_send("   reboot  - system soft reboot (vm), hard reboot (hw): reboot -h")
+            await self.a_send("   webrepl - start webrepl, for file transfers use with --update")
+            await self.a_send("[CONF] Configure mode - built-in shell commands")
+            await self.a_send("  conf       - Enter conf mode")
+            await self.a_send("    dump       - Dump all data")
+            await self.a_send("    key        - Get value")
+            await self.a_send("    key value  - Set value")
+            await self.a_send("  noconf     - Exit conf mode")
+            await self.a_send("[TASK] postfix: &x - one-time,  &&x - periodic, x: wait ms [x min: 20ms]")
+            await self.a_send("  task list         - list tasks with <tag>s")
+            await self.a_send("  task kill <tag>   - stop task")
+            await self.a_send("  task show <tag>   - show task output")
+            await self.a_send("[EXEC] Command mode (LMs):")
+            await self.a_send("   help lm  - list ALL LoadModules")
             if "lm" in str(msg_list):
-                return Shell._show_lm_funcs(msg_obj=self.send)
-            return Shell._show_lm_funcs(msg_obj=self.send, active_only=True)
+                return await Shell._show_lm_funcs(msg_obj=self.a_send)
+            return await Shell._show_lm_funcs(msg_obj=self.a_send, active_only=True)
 
         # [2] EXECUTE:
         # @1 Configure mode
         if self.__conf_mode and len(msg_list) > 0:
             # Lock thread under config handling is threads available
-            return Shell._configure(self.send, msg_list)
+            return await Shell._configure(self.a_send, msg_list)
         # @2 Command mode
         """
         INPUT MSG STRUCTURE
@@ -193,43 +190,43 @@ class Shell:
         """
         try:
             # Execute command via InterpreterCore
-            self.send(lm_exec(arg_list=msg_list)[1])
+            await self.a_send(lm_exec(arg_list=msg_list)[1])
             return True
         except Exception as e:
-            self.send(f"[ERROR] shell.lm_exec internal error: {e}")
+            await self.a_send(f"[ERROR] shell.lm_exec internal error: {e}")
             return False
 
     #################################################################
     #                     CONFIGURE MODE HANDLER                    #
     #################################################################
     @staticmethod
-    def _configure(msg_obj, msg_list):
+    async def _configure(msg_obj, msg_list):
         """
         :param msg_obj: shell output stream function reference (write object)
         :param msg_list: socket input param list
         :return: execution status
         """
-        def dump():
+        async def dump():
             nonlocal msg_obj, msg_list
             if msg_list[0] == 'dump':
                 search = msg_list[1] if len(msg_list) == 2 else None
                 # DUMP DATA
                 for _key, value in cfgget().items():
                     if search is None or search in _key:
-                        msg_obj(f"  {_key}{' ' * (10 - len(_key))}:{' ' * 7} {value}")
+                        await msg_obj(f"  {_key}{' ' * (10 - len(_key))}:{' ' * 7} {value}")
                 return True
             return False
 
         # [CONFIG] Get value
         if len(msg_list) == 1:
-            if dump():                      # Simple dump without param filter
+            if await dump():                      # Simple dump without param filter
                 return True
             # GET SINGLE PARAMETER VALUE
-            msg_obj(cfgget(msg_list[0]))
+            await msg_obj(cfgget(msg_list[0]))
             return True
         # [CONFIG] Set value
         if len(msg_list) >= 2:
-            if dump():                      # Dump with search option
+            if await dump():                      # Dump with search option
                 return True
             # Deserialize params
             key = msg_list[0]
@@ -237,28 +234,28 @@ class Shell:
             try:
                 output = cfgput(key, " ".join(msg_list[1:]), type_check=True)
             except Exception as e:
-                msg_obj(f"node_config write error: {e}")
+                await msg_obj(f"node_config write error: {e}")
                 output = False
             # Evaluation and reply
-            msg_obj('Saved' if output else 'Invalid key' if cfgget(key) is None else 'Failed to save')
+            await msg_obj('Saved' if output else 'Invalid key' if cfgget(key) is None else 'Failed to save')
         return True
 
     #################################################################
     #                   COMMAND MODE & LMS HANDLER                  #
     #################################################################
     @staticmethod
-    def _show_lm_funcs(msg_obj, active_only=False):
+    async def _show_lm_funcs(msg_obj, active_only=False):
         """
         Dump LM modules with functions - in case of [py] files
         Dump LM module with help function call - in case of [mpy] files
         """
-        def _help(mod):
+        async def _help(mod):
             for lm_path in (i for i in mod if i.startswith('LM_') and (i.endswith('py'))):
                 lm_name = lm_path.replace('LM_', '').split('.')[0]
                 try:
-                    msg_obj(f"   {lm_name}")
+                    await msg_obj(f"   {lm_name}")
                     if lm_path.endswith('.mpy'):
-                        msg_obj(f"   {' ' * len(lm_path.replace('LM_', '').split('.')[0])}help")
+                        await msg_obj(f"   {' ' * len(lm_path.replace('LM_', '').split('.')[0])}help")
                         continue
                     with open(lm_path, 'r') as f:
                         line = "micrOSisTheBest"
@@ -266,9 +263,9 @@ class Shell:
                             line = f.readline()
                             ldata = line.strip()
                             if ldata.startswith('def ') and not ldata.split()[1].startswith("_") and 'self' not in ldata:
-                                msg_obj(f"   {' ' * len(lm_name)}{ldata.replace('def ', '').split('(')[0]}")
+                                await msg_obj(f"   {' ' * len(lm_name)}{ldata.replace('def ', '').split('(')[0]}")
                 except Exception as e:
-                    msg_obj(f"[{lm_path}] SHOW LM PARSER WARNING: {e}")
+                    await msg_obj(f"[{lm_path}] SHOW LM PARSER WARNING: {e}")
                     return False
             return True
 
@@ -276,29 +273,30 @@ class Shell:
         if active_only:
             mod_keys = modules.keys()
             active_modules = (dir_mod for dir_mod in listdir() if dir_mod.split('.')[0] in mod_keys)
-            return _help(active_modules)
+            return await _help(active_modules)
         # [2] list all LMs on file system (ALL - help lm) - manual
-        return _help(listdir())
+        return await _help(listdir())
 
     @staticmethod
-    def webrepl(msg_obj, update=False):
+    async def webrepl(msg_obj, update=False):
         from Network import ifconfig
 
-        msg_obj(" Start micropython WEBREPL - file transfer and debugging")
-        msg_obj("  [i] restart machine shortcut: import reset")
-        msg_obj(f"  Connect over http://micropython.org/webrepl/#{ifconfig()[1][0]}:8266/")
-        msg_obj(f"  \t[!] webrepl password: {cfgget('appwd')}")
+        await msg_obj(" Start micropython WEBREPL - file transfer and debugging")
+        await msg_obj("  [i] restart machine shortcut: import reset")
+        await msg_obj(f"  Connect over http://micropython.org/webrepl/#{ifconfig()[1][0]}:8266/")
+        await msg_obj(f"  \t[!] webrepl password: {cfgget('appwd')}")
         if update:
-            msg_obj(" Restart node then start webrepl...")
-            msg_obj(" Bye!")
+            await msg_obj(" Restart node then start webrepl...")
+            await msg_obj(" Bye!")
             # Set .if_mode->webrepl (start webrepl after reboot and poll update status...)
             with open('.if_mode', 'w') as f:
                 f.write('webrepl')
             hard_reset()
         try:
             import webrepl
-            msg_obj(webrepl.start(password=cfgget('appwd')))
+            await msg_obj(webrepl.start(password=cfgget('appwd')))
         except Exception as e:
             _err_msg = f"[ERR] while starting webrepl: {e}"
-            msg_obj(_err_msg)
+            await msg_obj(_err_msg)
             errlog_add(_err_msg)
+        return True

{micrOSDevToolKit-2.9.1.dist-info → micrOSDevToolKit-2.9.4.dist-info}/METADATA

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

{micrOSDevToolKit-2.9.1.dist-info → micrOSDevToolKit-2.9.4.dist-info}/RECORD

@@ -32,9 +32,9 @@ micrOS/micropython/esp32s3_spiram_oct-20231005-v1.21.0.bin,sha256=S-sv_QeL_Tylg1
 micrOS/micropython/esp32s3_spiram_oct-20241129-v1.24.1.bin,sha256=VbOF_F0YeqttkQd2ePTW66Jd34RU8u9ccFfcv8kxO_U,1662672
 micrOS/micropython/rpi-pico-w-20241129-v1.24.1.uf2,sha256=v4aYIbWaE94_f6DDzBWS-a9L1BzlcdkZwld9R7bOVA4,1727488
 micrOS/micropython/tinypico-20241129-v1.24.1.bin,sha256=Kf3cr766a5SK99CZy8bwdWjwvAZxls3tBYvaHBsw7ac,1527200
-micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json,sha256=KTL6AgDxZMzgT_fRZrf4_dz1yU0t_W8DvCPzMn8vfCY,5762
+micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json,sha256=PTEMH6a2gWZnHxpB41WWkE5hJQwMUk_t6VECFbg2Ecc,5761
 micrOS/source/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
-micrOS/source/Common.py,sha256=wFN5RwNUO7o4I5yU2Hqnm5rq16o4SFTxZI3kCqvebL8,7941
+micrOS/source/Common.py,sha256=PAdtseGY6QxUM-5elOAcApUv8AwGQ_smsYex0FeV5w8,7937
 micrOS/source/Config.py,sha256=me_mhQaqeIE5pVfd2SSZL5uuO2cTHRtjaiUcau4riJo,8867
 micrOS/source/Debug.py,sha256=_7HZzZ2OKJrcNqeYsG1ZykBa6iN8YTj-K5FFXlEAcRw,5300
 micrOS/source/Espnow.py,sha256=5B71XVm19byydMuhLmg-ij8uNmfMSAaRNi4iytvFN08,3715
@@ -104,12 +104,12 @@ micrOS/source/LM_telegram.py,sha256=8mwKUywZWbbjYKN68wnrXw4RnvOBI1OKlJrU4sfbG4U,
 micrOS/source/LM_tinyrgb.py,sha256=kChL607HPTl3Z2hYN2XnzXXfZ6omdP78PQutHdbdfCo,3031
 micrOS/source/LM_trackball.py,sha256=pVnL_GoXUbqwT6sflqysFWmamVGZOZwHPphrLt5MZXw,9728
 micrOS/source/LM_veml7700.py,sha256=p2NXb5o5c_tM68rBfbgcfxBR31-BY2jGS2JVF3AYBfk,5771
-micrOS/source/Logger.py,sha256=d8pK8T_K4Yxe1j_eAwkWB5N5xd14AvL34vJCPZRZTQA,2853
+micrOS/source/Logger.py,sha256=5dYTcxcGYRFkZvILuuW88coge1ChbupZvo_M8g0r5yE,3204
 micrOS/source/Network.py,sha256=wLhAPiRyi376TKJA7tzCQidDBHq-AbZGGp7JabHIyl8,9417
 micrOS/source/Notify.py,sha256=Fm4TfbiFCTz_95aQkMZBikakNUtAv7eZplI7XyufPRI,2351
 micrOS/source/Scheduler.py,sha256=K6fw807UJnOmbfzgeJQGzGbTL4s2sTIB120ZcS5qrLs,9648
-micrOS/source/Server.py,sha256=2a2hcfMEYSSJJ7ccUzaytT2aYmCuHsIOqzdk5ZnR8VY,16270
-micrOS/source/Shell.py,sha256=-sA_vT5puekl-EK85CYLQW8Dkz4SWtxx0r03ioRza-E,11934
+micrOS/source/Server.py,sha256=ytt0-PeoPnuyKdp08UNunna1a9MnVBtQaJQrlUpt4N8,16161
+micrOS/source/Shell.py,sha256=DR_4OxlDty14I7j2AOIl3zCcOVcLMojdzt6z3kopH4g,12388
 micrOS/source/Tasks.py,sha256=YMYt86TWnUBWa8j1DQjbOavYpktCizzfZXaKXrb6Fmo,22498
 micrOS/source/Time.py,sha256=96XMJjHCPwQ2qNuBD2Un7FXxzXZNbV1xCQn-RujsggU,6351
 micrOS/source/Types.py,sha256=3O_Vb1jN92RPtvgbV8ui6_iFzDOD-BUzVXlPB7PgmM4,3507
@@ -127,7 +127,7 @@ micrOS/source/urequests.py,sha256=f6IAPK1_xKVL69t1GlPc3zyKkWIwjOCEN7l8vqMjBp8,84
 micrOS/source/ustyle.css,sha256=P-s8ENwAcWoZi5bocrK3_kVzEjaRFKtFvEF6JRh4MBY,1429
 micrOS/source/uwidgets.js,sha256=BGeUSbNHn6PClgIgIE6QszwQVJ6j7lzgCBwvIX8cYgo,6631
 micrOS/source/uwidgets_pro.js,sha256=gbkk3SVttEVvDCwde-pJhAh4k7GuCFPdcWNq32pcKPE,3639
-micrOSDevToolKit-2.9.1.data/scripts/devToolKit.py,sha256=CVgEETK2JwWgtEFw_dAZPEfOpAQTYZfTb6810E1j2Hg,10660
+micrOSDevToolKit-2.9.4.data/scripts/devToolKit.py,sha256=CVgEETK2JwWgtEFw_dAZPEfOpAQTYZfTb6810E1j2Hg,10660
 toolkit/DevEnvCompile.py,sha256=H19-60ZpHzP30C-wqR5QTzMDHHpWrTk0Uzh--TZHxvw,12148
 toolkit/DevEnvOTA.py,sha256=OkEtO5cpym-kEgGpE3TQbyZ-nQOzZpGzbFdbgCibe7I,25356
 toolkit/DevEnvUSB.py,sha256=-Fdigxi8asEJG4npQpvbpgjHhESq0gz0rL6lthRupVA,33848
@@ -139,7 +139,7 @@ toolkit/img_stream.html,sha256=ZGyrUgpi-JhMl4euS-TTjwwGrg66a2pGUQCopWiveds,5135
 toolkit/index.html,sha256=pnwz1tpBdO-FRlsOLQ4-ah5hT8f-O_hhAI411QdiVJA,10873
 toolkit/micrOSdashboard.py,sha256=SOBzGU1b-NIn40GMd2gE01Fuo8HZP5d1XyVG24RkPeA,54433
 toolkit/micrOSlint.py,sha256=Ujmgtt79UFkoPmyp1u_XN8FYjOh2puA8XpaJNk47bZ0,25107
-toolkit/socketClient.py,sha256=n8wCojbNLSnsDa6ChxpqmjBPm6aIaDtTn8kzcwBKWmE,18556
+toolkit/socketClient.py,sha256=qBPmDPu9FyASlNZ2Q2gP4e-EGu6VyAC7ByiApQlu-CY,18623
 toolkit/dashboard_apps/AirQualityBME280.py,sha256=ufYAn_eFpCIcNSQUW6AGQN6Uh_5A3xVqSyoWegUNBuY,747
 toolkit/dashboard_apps/AirQualityDHT22_CO2.py,sha256=TG8Wkx7WOaGM1rpqD6t2rKFES0aqdCJvK-f5I5IK3a4,749
 toolkit/dashboard_apps/BackupRestore.py,sha256=zRkj6KDFnO9Cj6QUpE0Av39OQZcI8CycQcrqbvWBHqU,6339
@@ -156,7 +156,7 @@ toolkit/dashboard_apps/PresenceTest.py,sha256=MnWjqh3W3qAR9pKdjrOfx74numQw6-acrR
 toolkit/dashboard_apps/RGBTest.py,sha256=x9ehV6EGH2B4syKGEQrZQbMy1pBsB1M6in8idJ73Jrw,3920
 toolkit/dashboard_apps/RoboArm.py,sha256=STFIYYy0Li6gLdJx7eu3FZOucF_f5jupHVNFzU-Ta-Q,2084
 toolkit/dashboard_apps/SED_test.py,sha256=ASVRcoVQiS80tvjQHBnXd69aAioJ4lt_UnL1KAy01sM,2782
-toolkit/dashboard_apps/SystemTest.py,sha256=1fJpKnV2FUJtAEDk1F2koKLvLvEYXGla1f-PKgn6Rps,21738
+toolkit/dashboard_apps/SystemTest.py,sha256=Cc_CBiNLaE1UYw9TIQtDLKgtCUcjCtjKbE5lX6utQJE,21816
 toolkit/dashboard_apps/Template_app.py,sha256=fKF43E-XqibavvjUrCQzG-kMSTCe-sb3ckbLwDgGuTc,1002
 toolkit/dashboard_apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkit/dashboard_apps/_capture.py,sha256=75aS8ajhEYWNqoG2DwQgqJyArMouGHZNN-0mo1RH9bU,3076
@@ -167,11 +167,11 @@ toolkit/lib/LocalMachine.py,sha256=m5xaWRx1PumKFLQ5_O8vVxC4NTclF1h9J3__pK8N-C4,1
 toolkit/lib/SafeInput.py,sha256=gMXsMalPcFCwlN6niJlG2twOHfoGsEgHL9-Uh2YQJHE,855
 toolkit/lib/SearchDevices.py,sha256=1nnJDwo_U5cCN2xsdNUT6EQqdt2fW-qAWXWzyzXzyyc,5813
 toolkit/lib/SerialDriverHandler.py,sha256=Zn0zeq4mshTMVc6fzycvrOZiKt6w6YOxJcTWw3BMN2M,7344
-toolkit/lib/TerminalColors.py,sha256=GUF6GsiZg8jP0izhEwhtttcteBvPoMhkTMMh-M5ewmQ,847
+toolkit/lib/TerminalColors.py,sha256=Ly_8o9-eBmka1dqA2M3DBlcd1zvCCO2K_BnQ1XbqxcE,947
 toolkit/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkit/lib/file_extensions.py,sha256=0DpayBGjKQg7y2ZGJXf5wVPnre_4C5j-7YIViNGvYz4,372
 toolkit/lib/macroScript.py,sha256=Hic98kyOR1Up18T6Lrpnnv_8bkNdocnIbiXdv6R7jrI,13854
-toolkit/lib/micrOSClient.py,sha256=T-s5vYSnMgmYOkpET_P-AIjU-7M6mmx-oALT9dNsOZc,17009
+toolkit/lib/micrOSClient.py,sha256=Rej1x9IpFmCW6LAoFf6ylua7wjwm7Apil2mf1DNW7QA,17163
 toolkit/lib/pip_package_installer.py,sha256=jpC-y1KR72_PJlqyUR6-U5b6l1szVqnIZ4nrSgUsOTM,4262
 toolkit/simulator_lib/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 toolkit/simulator_lib/IO_darwin.py,sha256=f8HOfQKJvniShvjpBe6f4nisr6oJd9SnvxPsbdNIGQk,2336
@@ -263,7 +263,7 @@ toolkit/user_data/webhooks/macro.py,sha256=E_Um6fc9P6sBKvChyrKgksHmBmaFUuq_Xxy8I
 toolkit/user_data/webhooks/template.macro,sha256=XikSl3FsD6W9pUx3sqavM5tWIMBquFx9f3bh_CB8k-A,631
 toolkit/user_data/webhooks/template.py,sha256=WssXY2BDKIwvObq0SpFCjjpEGzgbLlozFTug4ANswWM,342
 toolkit/workspace/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-toolkit/workspace/precompiled/Common.mpy,sha256=vpavv1IDKQ8HQOvUj2Z6nh5S5Hxih2UQgl3CjSD3vMs,2144
+toolkit/workspace/precompiled/Common.mpy,sha256=2bUIMJPc9AAVGtgzI_6DaNqF6T-kLyyd4Ys_yjrgI9A,2140
 toolkit/workspace/precompiled/Config.mpy,sha256=X1SAfiWEMvduP6kFcVSjfY3TJsIKcbITDq1lrEIj67M,3076
 toolkit/workspace/precompiled/Debug.mpy,sha256=OpoE-QcllAnASSnAC0V364G7zHjbYI_0jSPzPRBhWkI,1823
 toolkit/workspace/precompiled/Espnow.mpy,sha256=yzC_KeCfVzWKidRbEw_R6LQeKG6DFMu4XAssXqFSuKQ,1438
@@ -333,12 +333,12 @@ toolkit/workspace/precompiled/LM_telegram.mpy,sha256=qdsv0aHVhrpNvrWKzzdIi4xvuT2
 toolkit/workspace/precompiled/LM_tinyrgb.mpy,sha256=qWR-e8DXuzmstxQlyic0YjwFaGiBBBWpf57Wyn1jjFc,1016
 toolkit/workspace/precompiled/LM_trackball.mpy,sha256=8OFO02VeETcwkuOACh0e9amRWwTpoRogEXcVmRBrUn4,3474
 toolkit/workspace/precompiled/LM_veml7700.mpy,sha256=-MPEbH9RzOk0hzBuXf5XzOHKZdeRD0xBgf890GJu6Vg,1956
-toolkit/workspace/precompiled/Logger.mpy,sha256=aFGjkv1bozWer4d-OoQQ2pp252zlMWxU0_m7LRhnaIc,854
+toolkit/workspace/precompiled/Logger.mpy,sha256=ztBXR7yqWezXuLSbsmZP41pWUq_4cw9K6aNcQgNe-nM,1081
 toolkit/workspace/precompiled/Network.mpy,sha256=WtpvhGB2bvEe94dAHV40fpEyk-Fi0D6vL1q_m6k4qBg,3274
 toolkit/workspace/precompiled/Notify.mpy,sha256=lyl5J16b8X2vnHzHSikzlNCX5XLQ7JaB0midEmVMn58,872
 toolkit/workspace/precompiled/Scheduler.mpy,sha256=ctCj7FfXj5TchPPxe_9dmnTXWN88egtbAnmJ0N9u_1w,2202
-toolkit/workspace/precompiled/Server.mpy,sha256=k-31qSfIxZKBPWaoUWBPQbmcLMcy69SSQMkDFrtuRGA,4899
-toolkit/workspace/precompiled/Shell.mpy,sha256=0n6SWX5keDANNW0ACZUcmkntOJdyh8tKPZzX7QX9jHk,4167
+toolkit/workspace/precompiled/Server.mpy,sha256=Rk_Pkg_Pc_7W6tIiRcGfU4S9YChYPYw4-WKOqz0gUZY,4746
+toolkit/workspace/precompiled/Shell.mpy,sha256=z52FjUhn2S345FjXp8KgyQ30rFvgOVkcVDwpcSfDqNk,4334
 toolkit/workspace/precompiled/Tasks.mpy,sha256=vL3tDV7Us3Wg7qtZA8ovqEsvLndOmu14GHcZF2_DtrY,6253
 toolkit/workspace/precompiled/Time.mpy,sha256=D6jvLP5tUKQdJGcn6Q4-ru-p0at6hnxfLC5bqC78gv0,2756
 toolkit/workspace/precompiled/Types.mpy,sha256=LssRbPgvsWuR4d2m3R7VMIvsnkVp9nN0ltwaY2wGop8,1401
@@ -358,8 +358,8 @@ toolkit/workspace/precompiled/urequests.mpy,sha256=FnrzbNJtHfmIJN1PpwhQ__CDx6Vmd
 toolkit/workspace/precompiled/ustyle.css,sha256=P-s8ENwAcWoZi5bocrK3_kVzEjaRFKtFvEF6JRh4MBY,1429
 toolkit/workspace/precompiled/uwidgets.js,sha256=BGeUSbNHn6PClgIgIE6QszwQVJ6j7lzgCBwvIX8cYgo,6631
 toolkit/workspace/precompiled/uwidgets_pro.js,sha256=gbkk3SVttEVvDCwde-pJhAh4k7GuCFPdcWNq32pcKPE,3639
-micrOSDevToolKit-2.9.1.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-micrOSDevToolKit-2.9.1.dist-info/METADATA,sha256=Og49_Wr05gkkSy5Pm8X_PQ5K30eMxqzic_67UCheC_8,53468
-micrOSDevToolKit-2.9.1.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-micrOSDevToolKit-2.9.1.dist-info/top_level.txt,sha256=rOGOIXqLBdGZAoDTiLdZ9B_leFB7bMv7YabLwuIc2bc,25
-micrOSDevToolKit-2.9.1.dist-info/RECORD,,
+micrOSDevToolKit-2.9.4.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+micrOSDevToolKit-2.9.4.dist-info/METADATA,sha256=2UV8fRBCkJApZjqaoF9oIvrKoWke7Bnl_YUoErTz0Pw,53468
+micrOSDevToolKit-2.9.4.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+micrOSDevToolKit-2.9.4.dist-info/top_level.txt,sha256=rOGOIXqLBdGZAoDTiLdZ9B_leFB7bMv7YabLwuIc2bc,25
+micrOSDevToolKit-2.9.4.dist-info/RECORD,,

toolkit/dashboard_apps/SystemTest.py

@@ -359,8 +359,9 @@ def check_robustness_recursion():
 def check_intercon(host=None):
     def _convert_return_to_dict(data):
         try:
-            data_dict = ast.literal_eval(data[1])
+            data_dict = ast.literal_eval(data[1].split("\n")[0])
         except Exception as e:
+            print(f"WARNING: cannot parse output as dir: {e}")
             data_dict = {'tag': None, 'verdict': f'{data}: {str(e)}'}
         return data[0], data_dict
 

toolkit/lib/TerminalColors.py

@@ -16,6 +16,8 @@ class Colors:
         OKGREEN = '\033[92m'
         HEADER = '\033[95m'
         UNDERLINE = '\033[4m'
+        LIGHT_GRAY = '\033[37m'
+        GRAY = '\033[90m'
     else:
         NC = ''
         OK = ''
@@ -26,6 +28,8 @@ class Colors:
         OKGREEN = ''
         HEADER = ''
         UNDERLINE = ''
+        LIGHT_GRAY = ''
+        GRAY = ''
 
 
 if __name__ == "__main__":

toolkit/lib/micrOSClient.py

@@ -160,7 +160,7 @@ class micrOSClient:
                 self.preprompt = ""
         return _data
 
-    def __receive_data(self, read_timeout=20):
+    def __receive_data(self, read_timeout=20, stream=False):
         """
         Client Receiver Loop
         - read_timeout - wait for server to reply (should be <15, avoid msg queue-ing)
@@ -173,7 +173,11 @@ class micrOSClient:
         # Collect answer data
         if select.select([self.conn], [], [], read_timeout)[0]:
             while True:
-                data_buffer += self.conn.recv(4096).decode('utf-8')
+                incoming_data = self.conn.recv(4096).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="")
+                data_buffer += incoming_data
                 # Last line from data_buffer (handle fragmented messages - prompt detection)
                 last_line = data_buffer.strip().split("\n")[-1]
                 # Wait for prompt or special cases (exit/prompt)
@@ -200,7 +204,7 @@ class micrOSClient:
         self.isconn = False
         self.spacer = 0
 
-    def __run_command(self, cmd):
+    def __run_command(self, cmd, stream=False):
         """
         Run command on server tcp/ip connection
         - prompt check - validate device ("hostname $" = "prompt")
@@ -218,14 +222,14 @@ class micrOSClient:
             # Workaround for reboot command - micrOS async server cannot send Bye! msg before reboot.
             if reboot_request:
                 return 'Bye!'
-            data = self.__receive_data()
+            data = self.__receive_data(stream=stream)
             return data
         # Skip command run: prompt and host not the same!
         print(f"[micrOSClient] {color.ERR}prompt mismatch{color.NC}, hostname: {check_hostname} prompt: {check_prompt} ")
         # Check UID?
         return None
 
-    def send_cmd(self, cmd, timeout=3, retry=5):
+    def send_cmd(self, cmd, timeout=3, retry=5, stream=False):
         """
         Send command function - main usage for non interactive mode
         """
@@ -244,7 +248,7 @@ class micrOSClient:
 
         # @ Run command
         try:
-            out = self.__run_command(cmd)
+            out = self.__run_command(cmd, stream=stream)
         except Exception as e:
             self.dbg_print("{}[ERR]{} send_cmd error: {}".format(color.ERR, color.NC, e))
             self.dbg_print("Auto deinit connection")
@@ -261,11 +265,11 @@ class micrOSClient:
         # return output list
         return out
 
-    def send_cmd_retry(self, cmd, timeout=6, retry=5):
+    def send_cmd_retry(self, cmd, timeout=6, retry=5, stream=False):
         out = None
         for cnt in range(0, retry):
             try:
-                out = self.send_cmd(cmd, timeout)
+                out = self.send_cmd(cmd, timeout, stream=stream)
                 if out is None or isinstance(out, list):
                     break
             except OSError as e:
@@ -287,16 +291,12 @@ class micrOSClient:
             print("Telnet connect: {}".format(e))
             if "busy" in str(e) or "timed out" in str(e) or "No route to host" in str(e) or "Host is down" in str(e):
                 return
+
+        print(f"{color.BOLD}{self.preprompt}{self.prompt}{color.NC} ", end="")
         while True:
-            cmd = input("{}{} ".format(self.preprompt, self.prompt))
+            cmd = input()
             # send command
-            output = self.send_cmd(cmd)
-            # Format output to human readable
-            output = '\n'.join(output) if isinstance(output, list) else output
-            # output to STDOUT
-            if not (cmd.strip() == '' and output is None):
-                print(output)
-            # Close session
+            output = self.send_cmd(cmd, stream=True)
             if 'Bye!' in str(output):
                 break
         self.close()

toolkit/socketClient.py

@@ -210,8 +210,8 @@ class ConnectionData:
                         start_comm = time.time()
                         version_data = SocketDictClient(host=ip, port=port, silent_mode=True, tout=3).non_interactive(['version'])
                         elapsed_time = "{:.3f}".format(time.time() - start_comm)
-                    except:
-                        pass
+                    except Exception as e:
+                        print(f"Getting device version {fuid}:{uid} error: {e}")
 
                 # Generate line printout
                 base_info = "{uid}{spr1}{fuid}".format(uid=uid, spr1=spacer1, fuid=fuid)