micrOSDevToolKit 2.9.11__py3-none-any.whl → 2.10.5__py3-none-any.whl

micrOS/source/LM_oledui.py

@@ -4,13 +4,8 @@ from Types import resolve
 # Core modules
 from Config import cfgget
 from Time import uptime
-
 # Load Modules
-from LM_system import top, memory_usage, ifconfig, rssi as sta_rssi, list_stations
-try:
-    import LM_intercon as InterCon
-except:
-    InterCon = None             # Optional function handling
+from LM_system import top, memory_usage, ifconfig, rssi as sta_rssi, list_stations, hosts
 try:
     from LM_esp32 import temp as cpu_temp
 except Exception as e:
@@ -785,10 +780,13 @@ class PageUI:
             # Check open host connection
             try:
                 # Send CMD to other device & show result
-                data_meta = InterCon.send_cmd(host, cmd)
-                self._cmd_task_tag = data_meta['tag']
-                if "Task is Busy" in data_meta['verdict'] and not run:
-                    self.app_frame.press_output = data_meta['verdict']     # Otherwise the task start output not relevant on UI
+                state, data_meta = exec_cmd(cmd + [f">>{host}"], jsonify=True, skip_check=True)
+                if state:
+                    self._cmd_task_tag = data_meta['tag']
+                    if "Task is Busy" in data_meta['verdict'] and not run:
+                        self.app_frame.press_output = data_meta['verdict']     # Otherwise the task start output not relevant on UI
+                else:
+                    self.app_frame.press_output = f"Error: {data_meta}"
             except Exception as e:
                 self.app_frame.press_output = str(e)
 
@@ -803,7 +801,7 @@ class PageUI:
                     self._cmd_task_tag = None
             PageUI.write_lines(self.app_frame.press_output, display, x, y + 20, line_limit=2)
 
-        PageUI.write_lines(f"{host.split(".")[0]}:{cmd}", display, x, y, line_limit=2)
+        PageUI.write_lines(f"{host.split(".")[0]}:{' '.join(cmd)}", display, x, y, line_limit=2)
         if run:
             if self._cmd_task_tag is None:
                 _execute(display, w, h, x, y)
@@ -829,14 +827,13 @@ def _system_page(display, w, h, x, y):
     return True
 
 def _intercon_nodes_page(display, w, h, x, y):
-    if InterCon is None:
-        return False
     line_limit = 3
     line_start = y+5
     line_cnt = 1
     display.text("InterCon cache", x, line_start)
-    if sum([1 for _ in InterCon.host_cache()]) > 0:
-        for key, val in InterCon.host_cache().items():
+    cache = hosts()["intercon"]
+    if sum([1 for _ in cache]) > 0:
+        for key, val in cache.items():
             key = key.split('.')[0]
             val = '.'.join(val.split('.')[-2:])
             display.text(f" {val} {key}", x, line_start + (line_cnt * 10))
@@ -934,7 +931,7 @@ def intercon_genpage(cmd=None, run=False):
     """
     raw = cmd.split()
     host = raw[0]
-    cmd = ' '.join(raw[1:])
+    cmd = raw[1:]
     try:
         # Create page for intercon command
         PageUI.INSTANCE.add_page(lambda display, w, h, x, y: PageUI.INSTANCE.intercon_exec_page(host, cmd, run, display, w, h, x, y))

micrOS/source/LM_pacman.py

@@ -1,73 +1,56 @@
-from uos import listdir, remove, stat
 from sys import modules
 from Common import socket_stream
-
-WEB_EXT = ('html', 'js', 'css')
-DATA_TYPES = ('log', 'pds', 'dat')
-
-def _is_app_resource(path='/'):
-    if stat(path)[0] & 0x4000:      # Dir check
-        return True, 'd'
-    file_name = path.split("/")[-1]
-    if file_name.startswith('LM_') or file_name.split('.')[-1] in WEB_EXT + DATA_TYPES:
-        return True, 'f'
-    return False, '?'
+from Files import _is_module, list_fs, ilist_fs, remove_fs
 
 
 #############################################
 #     Safe file system handler functions    #
 #############################################
 
-def ls(path="/", content='*', raw=False):
+def ls(path="/", content='*', raw=False, select='*'):
     """
     Linux like ls command - list app resources and app folders
     :param path: path to list, default: /
     :param content: content type, default all, f-file, d-dir can be selected
     :param raw: keep raw output [(is_app, type), ...]
+    :param select: select specific app resource: LM or IO, default: all
     """
-    path = path if path.endswith('/') else f"{path}/"
-    items = []
-    for item in listdir(path):
-        is_app, item_type = _is_app_resource(path + item)
-        if is_app and (content == "*" or item_type == content):
-            items.append((item_type, item))
+    items = list_fs(path, content, select=select)
     if raw:
         return items
-    formatted_output = ""
-    i = 0
-    for f in items:
-        i += 1
-        spacer = " " * (4 - len(str(i)))
-        formatted_output += f"{i}{spacer}{f[0]}   {f[1]}\n"
-    return formatted_output
+
+    # Build a formatted output (just like `ls -l` style index)
+    lines = ""
+    for i, f in enumerate(items):
+        spacer = " " * (4 - len(str(i+1)))
+        if content == "*":
+            lines += f"{i+1}{spacer}{f[0]}   {f[1]}\n"
+        else:
+            lines += f"{i + 1}{spacer}{f}\n"
+    return lines
 
 
-def rm(path):
+def rm(path, allow_dir=False):
     """
     Linux like rm command - delete app resources and folders
     :param path: app resource name/path, ex.: LM_robustness.py
+    :param allow_dir: enable directory deletion, default: False
     """
-    if 'pacman.' in path or 'system.' in path or "/" == path.strip():
-        return f'Load module {path} is protected, skip delete.'
-    is_app, item_type = _is_app_resource(path)
-    if is_app:
-        remove(path)
-        return f"Remove: {path} {'dir' if item_type == 'd' else 'file'}"
-    return f"Invalid path {path}"
+    return remove_fs(path, allow_dir)
 
 
 def dirtree(path="/", raw=False):
     """Return only directories from a given path."""
     path = path if path.endswith('/') else f"{path}/"
-    folders = [f"{path}/{item}" for item in listdir(path) if _is_app_resource(f"{path}{item}")[1] == 'd']
-    folder_contents = {folder:listdir(folder) for folder in folders}
+    folders = [f"{path}/{item}" for item in ilist_fs(path, type_filter='d')]
+    folder_contents = {folder:list_fs(folder) for folder in folders}
     if raw:
         return folder_contents
     formatted_output = ""
     for k, v in folder_contents.items():
         formatted_output += f"{k}\n"
         for val in v:
-            formatted_output += f"\t{val}\n"
+            formatted_output += f"\t{val[0]}   {val[1]}\n"
     return formatted_output
 
 
@@ -108,18 +91,20 @@ def del_duplicates():
     - delete duplicated .mpy and .py resources, keep .mpy resource!
     """
     msg_buf = []
-    py = list((res.split('.')[0] for res in listdir() if res.endswith('.py')))       # Normally smaller list
-    mpy = (res.split('.')[0] for res in listdir() if res.endswith('.mpy'))
+    files =  list_fs(type_filter='f', select='LM')
+    py = list((res.split('.')[0] for res in files if res.endswith('.py')))       # Normally smaller list
+    mpy = (res.split('.')[0] for res in files if res.endswith('.mpy'))
     for m in mpy:
         # Iterate over mpy resources
         state = True
         if m in py and m != 'main':
             to_delete = f'{m}.py'
             try:
-                remove(to_delete)
+                verdict = remove_fs(to_delete)
             except:
+                verdict = "n/a"
                 state = False
-            msg_buf.append(f'   Delete {to_delete} {state}')
+            msg_buf.append(f'   Delete {to_delete} {state} - {verdict}')
     return '\n'.join(msg_buf) if len(msg_buf) > 0 else 'Nothing to delete.'
 
 
@@ -147,7 +132,7 @@ def cachedump(delpds=None, msgobj=None):
     if delpds is None:
         # List pds files aka application cache
         msg_buf = []
-        for pds in (_pds for _pds in listdir() if _pds.endswith('.pds')):
+        for pds in (_pds for _pds in ilist_fs(type_filter='f') if _pds.endswith('.pds')):
             with open(pds, 'r') as f:
                 if msgobj is None:
                     msg_buf.append(f'{pds}: {f.read()}')
@@ -156,8 +141,8 @@ def cachedump(delpds=None, msgobj=None):
         return msg_buf if len(msg_buf) > 0 else ''
     # Remove given pds file
     try:
-        remove(f'{delpds}.pds')
-        return f'{delpds}.pds delete done.'
+        verdict = remove_fs(f'{delpds}.pds')
+        return f'{delpds}.pds delete done.: {verdict}'
     except:
         return f'{delpds}.pds not exists'
 
@@ -168,7 +153,7 @@ def dat_dump():
     - logged data from LMs, sensor datat, etc...
     """
     logs_dir = "/logs/"
-    dats = (f for f in listdir(logs_dir) if f.endswith('.dat'))
+    dats = (f for f in ilist_fs(type_filter='f') if f.endswith('.dat'))
     out = {}
     for dat in dats:
         with open(f"{logs_dir}{dat}", 'r') as f:
@@ -188,8 +173,7 @@ def listmods(msgobj=None):
     """
     # Dump available LMs
     msg_buf = []
-    for k in (res.replace('LM_', '') for res in listdir("/")
-              if res.startswith('LM_') or res.split('.')[-1] in WEB_EXT):
+    for k in (res.replace('LM_', '') for res in ilist_fs(type_filter='f', select='LM')):
         if msgobj is None:
             msg_buf.append(f'   {k}')
         else:
@@ -197,21 +181,17 @@ def listmods(msgobj=None):
     return msg_buf if len(msg_buf) > 0 else ''
 
 
-def delmod(mod=None):
+def delmod(mod):
     """
     Module package manager
     :param mod:
         Delete Load Module with full name: module.py or module.mpy
         OR delete any web resource: *.js, *.css, *.html
     """
-    if mod is not None and (mod.endswith('py') or mod.split('.')[-1] in WEB_EXT):
-        # LM exception list - system and pacman cannot be deleted
-        if 'pacman.' in mod or 'system.' in mod:
-            return f'Load module {mod} is in use, skip delete.'
+    if mod.endswith('py') or _is_module(mod):
         try:
-            to_remove = mod if mod.split('.')[-1] in WEB_EXT else f'LM_{mod}'
-            remove(to_remove)
-            return f'Delete module: {mod}'
+            to_remove = f'LM_{mod}' if mod.endswith('py') else mod
+            return remove_fs(to_remove)
         except Exception as e:
             return f'Cannot delete: {mod}: {e}'
     return f'Invalid value: {mod}'
@@ -223,7 +203,7 @@ def micros_checksum(msgobj=None):
     from binascii import hexlify
     from Config import cfgget
 
-    for f_name in (_pds for _pds in listdir() if _pds.endswith('py')):
+    for f_name in ilist_fs(type_filter='f', select='LM'):
         with open(f_name, 'rb') as f:
             cs = hexlify(sha1(f.read()).digest()).decode('utf-8')
         msgobj(f"{cs} {f_name}")
@@ -244,5 +224,5 @@ def help(widgets=False):
             'dat_dump',
             'download url="BxNxM/micrOS/master/toolkit/workspace/precompiled/LM_robustness.py"',
             'micros_checksum',
-            'ls path="/" content="*/f/d"',
+            'ls path="/" content="*/f/d" select="*/LM/IO"',
             'rm <path>', 'dirtree path="/"')

micrOS/source/LM_presence.py

@@ -1,10 +1,7 @@
 from microIO import bind_pin, pinmap_search
-from Common import SmartADC, micro_task, notify, syslog
+from Common import SmartADC, micro_task, notify, syslog, exec_cmd
 from utime import ticks_ms
-try:
-    import LM_intercon as InterCon
-except:
-    InterCon = None
+
 
 class Data:
     TASK_TAG = 'presence._capture'
@@ -68,9 +65,9 @@ def __run_intercon(state):
         try:
             cmd = Data.ON_INTERCON_CLBK.split()
             host = cmd[0]
-            cmd = ' '.join(cmd[1:])
-            # Send CMD to other device & show result
-            InterCon.send_cmd(host, cmd)
+            cmd = cmd[1:]
+            # Send CMD to other device
+            state, _ = exec_cmd(cmd + [f">>{host}"], jsonify=True, skip_check=True)
         except Exception as e:
             syslog(f"__run_intercon error: {e}")
     if state.lower() == "off":
@@ -79,9 +76,9 @@ def __run_intercon(state):
         try:
             cmd = Data.OFF_INTERCON_CLBK.split()
             host = cmd[0]
-            cmd = ' '.join(cmd[1:])
-            # Send CMD to other device & show result
-            InterCon.send_cmd(host, cmd)
+            cmd = cmd[1:]
+            # Send CMD to other device
+            state, _ = exec_cmd(cmd + [f">>{host}"], jsonify=True, skip_check=True)
         except Exception as e:
             syslog(f"__run_intercon error: {e}")
 

micrOS/source/LM_system.py

@@ -1,4 +1,4 @@
-from uos import statvfs, getcwd, listdir, uname
+from uos import statvfs, getcwd, uname
 from utime import localtime
 from network import WLAN, STA_IF, AP_IF
 from binascii import hexlify
@@ -212,14 +212,15 @@ def ifconfig():
     return network_config()
 
 
-def urequest_hosts():
+def hosts():
     """
-    Debug function for urequests address caching
-    - returns all known http(s) host addresses
-    - cache only in memory
+    Dump cached hosts
+    - urequests (only memory cache)
+    - intercon connection cache
     """
     from urequests import host_cache
-    return host_cache()
+    from InterConnect import host_cache as ihost_cache
+    return {"urequests": host_cache(), "intercon":  ihost_cache()}
 
 
 def notifications(enable=None):
@@ -246,4 +247,4 @@ def help(widgets=False):
                     'ntp', 'rssi', 'list_stations', 'pinmap key="dhtpin"/None', 'alarms clean=False',
                     'notifications enable=<None,True,False>',
                     'sun refresh=False', 'ifconfig', 'memory_usage',
-                    'disk_usage', 'urequest_hosts'), widgets=widgets)
+                    'disk_usage', 'hosts'), widgets=widgets)

micrOS/source/LM_telegram.py

@@ -4,6 +4,11 @@ from Notify import Notify
 from Config import cfgget
 from Common import micro_task, syslog, console_write
 from LM_system import ifconfig
+from utime import localtime
+
+def _timestamp():
+    _time = [str(k) for k in localtime()[3:6]]
+    return ':'.join(_time)
 
 
 class Telegram(Notify):
@@ -106,12 +111,12 @@ class Telegram(Notify):
         Update known chat_id-s and cache them
         - return active chat_id frm resp_json
         """
-        console_write("[NTFY GET] update chatIDs")
         _cid = None
         if resp_json.get("ok", None) and len(resp_json["result"]) > 0:
             _cid = resp_json["result"][-1]["message"]["chat"]["id"]
             # LIMIT Telegram._CHAT_IDS NOTIFICATION CACHE TO 3 IDs
-            if len(Telegram._CHAT_IDS) < 4:
+            if len(Telegram._CHAT_IDS) < 4 and _cid not in Telegram._CHAT_IDS:
+                console_write("[NTFY GET] update chatIDs")
                 _ids = len(Telegram._CHAT_IDS)
                 Telegram._CHAT_IDS.add(_cid)
                 if len(Telegram._CHAT_IDS) - _ids > 0:  # optimized save (slow storage access)
@@ -135,7 +140,7 @@ class Telegram(Notify):
             return None
         response = {'sender': None, 'text': None, 'm_id': -1, 'c_id': None}
         url = f"https://api.telegram.org/bot{bot_token}/getUpdates{Telegram._API_PARAMS}"
-        console_write(f"\t1/2[GET] request: {url}")
+        console_write(f"\t[GET] request: {url}")
 
         _, resp_json = urequests.get(url, jsonify=True, sock_size=128)
 
@@ -145,7 +150,7 @@ class Telegram(Notify):
             response['sender'] = f"{resp['chat']['first_name']}{resp['chat']['last_name']}" if resp['chat'].get(
                 'username', None) is None else resp['chat']['username']
             response['text'], response['m_id'] = resp['text'], resp['message_id']
-        console_write(f"\t2/2[GET] response: {response}")
+        console_write(f"\t\t[GET] response: {response}")
         return response
 
     @staticmethod
@@ -160,7 +165,7 @@ class Telegram(Notify):
             return None
         response = {'sender': None, 'text': None, 'm_id': -1, 'c_id': None}
         url = f"https://api.telegram.org/bot{bot_token}/getUpdates{Telegram._API_PARAMS}"
-        console_write(f"\t1/2[GET] request: {url}")
+        console_write(f"\t[aGET] request: {url}")
 
         _, resp_json = await urequests.aget(url, jsonify=True, sock_size=128)
 
@@ -170,7 +175,7 @@ class Telegram(Notify):
             response['sender'] = f"{resp['chat']['first_name']}{resp['chat']['last_name']}" if resp['chat'].get(
                 'username', None) is None else resp['chat']['username']
             response['text'], response['m_id'] = resp['text'], resp['message_id']
-        console_write(f"\t2/2[GET] response: {response}")
+        console_write(f"\t\t[aGET] response: {response}")
         return response
 
     @staticmethod
@@ -183,14 +188,14 @@ class Telegram(Notify):
         console_write("[NTFY] EVAL sequence")
         verdict = None
 
-        def lm_execute(cmd_args):
+        def _lm_execute(cmd_args):
             nonlocal verdict, m_id
             access, output = Telegram.lm_execute(cmd_args)
             if access:
-                verdict = f'[UP] Exec: {" ".join(cmd_args[0])}'
+                verdict = f'{_timestamp()} [UP] Exec: {" ".join(cmd_args[0])}'
                 Telegram.send_msg(output, reply_to=m_id)
             else:
-                verdict = f'[UP] NoAccess: {cmd_args[0]}'
+                verdict = f'{_timestamp()} [UP] NoAccess: {cmd_args[0]}'
                 Telegram._IN_MSG_ID = m_id
 
         # -------------------------- FUNCTION MAIN -------------------------- #
@@ -211,12 +216,12 @@ class Telegram(Notify):
                 cmd_lm = msg_in.strip().split()[1:]
                 # [Compare] cmd selected device param with DEVFID (device/prompt name)
                 if cmd_lm[0] in Telegram._DEVFID:
-                    lm_execute(cmd_lm[1:])
+                    _lm_execute(cmd_lm[1:])
                 else:
-                    verdict = f'[UP] NoSelected: {cmd_lm[0]}'
+                    verdict = f'{_timestamp()} [UP] NoSelected: {cmd_lm[0]}'
             elif msg_in.startswith('/cmd'):
                 cmd_lm = msg_in.strip().split()[1:]
-                lm_execute(cmd_lm)
+                _lm_execute(cmd_lm)
             elif msg_in.startswith('/notify'):
                 param = msg_in.strip().split()[1:]
                 if len(param) > 0:
@@ -226,8 +231,7 @@ class Telegram(Notify):
                 # Send is still synchronous (OK)
                 Telegram.send_msg(verdict, reply_to=m_id)
         else:
-            verdict = "[UP] NoExec"
-        console_write(f"\tBOT: {verdict}")
+            verdict = f"{_timestamp()} [UP] NoExec"
         return verdict
 
     @staticmethod
@@ -241,11 +245,12 @@ class Telegram(Notify):
         period = period if period > 0 else 1
         period_ms = period * 1000
         with micro_task(tag=tag) as my_task:
-            my_task.out = "[UP] Running"
+            my_task.out = f"{_timestamp()} [UP] Running"
             while True:
                 # Normal task period
                 await my_task.feed(sleep_ms=period_ms)
                 try:
+                    # await asyncio.wait_for(Telegram.receive_eval(), 5)    # 5 sec timeout???
                     v = await Telegram.receive_eval()
                     my_task.out = "Missing bot token" if v is None else f"{v} ({period}s)"
                     cancel_cnt = 0
@@ -254,7 +259,7 @@ class Telegram(Notify):
                     # Auto scale - blocking nature - in case of serial failures (5) - hibernate task (increase async sleep)
                     cancel_cnt += 1
                     if cancel_cnt > 5:
-                        my_task.out = f"[DOWN] {e} (wait 1min)"
+                        my_task.out = f"{_timestamp()} [DOWN] {e} (wait 1min)"
                         cancel_cnt = 5
                         # SLOW DOWN - hibernate task
                         await my_task.feed(sleep_ms=60_000)

micrOS/source/Logger.py

@@ -6,7 +6,8 @@ Designed by Marcell Ban aka BxNxM
 """
 from time import localtime
 from re import match
-from uos import listdir, remove, stat, mkdir, getcwd
+from uos import remove, mkdir, getcwd
+from Files import ilist_fs, is_dir
 
 #############################################
 #        LOGGING WITH DATA ROTATION         #
@@ -18,14 +19,7 @@ def _init_logger():
     global LOG_FOLDER
     if LOG_FOLDER is None:
         LOG_FOLDER = f"{getcwd()}logs"
-        do_create = True
-        try:
-            if stat(LOG_FOLDER)[0] & 0x4000:
-                # Dir exists - skip create
-                do_create = False
-        except:
-            pass
-        if do_create:
+        if not is_dir(LOG_FOLDER):
             try:
                 mkdir(LOG_FOLDER)
                 syslog(f"[BOOT] log dir {LOG_FOLDER} init")
@@ -107,7 +101,7 @@ def log_get(f_name, msgobj=None):
 
 def syslog(data=None, msgobj=None):
     if data is None:
-        err_cnt = sum([log_get(f, msgobj) for f in listdir(LOG_FOLDER) if f.endswith(".sys.log")])
+        err_cnt = sum([log_get(f, msgobj) for f in ilist_fs(LOG_FOLDER, type_filter='f') if f.endswith(".sys.log")])
         return err_cnt
 
     _match = match(r"^\[([^\[\]]+)\]", data)
@@ -117,7 +111,7 @@ def syslog(data=None, msgobj=None):
 
 
 def log_clean(msgobj=None):
-    to_del = [file for file in listdir(LOG_FOLDER) if file.endswith('.log')]
+    to_del = [file for file in ilist_fs(LOG_FOLDER, type_filter='f') if file.endswith('.log')]
     for _del in to_del:
         _del = f"{LOG_FOLDER}/{_del}"
         if msgobj is not None: