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

micrOS/source/Shell.py

@@ -12,9 +12,9 @@ Designed by Marcell Ban aka BxNxM
 #                           IMPORTS                             #
 #################################################################
 from sys import modules
-from uos import listdir
 from machine import reset as hard_reset, soft_reset
 from Config import cfgget, cfgput
+from Files import ilist_fs
 from Tasks import lm_exec
 from Debug import errlog_add
 
@@ -25,7 +25,7 @@ from Debug import errlog_add
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '2.9.9-0'
+    MICROS_VERSION = '2.10.5-0'
 
     def __init__(self):
         """
@@ -106,6 +106,7 @@ class Shell:
             # No msg to work with
             return True
         msg_list = msg.strip().split()
+        local_cmd = not msg_list[-1].startswith(">>")   # intercon request check for shell commands
 
         ##########################################
         #   [1] Handle built-in shell commands   #
@@ -113,7 +114,7 @@ class Shell:
         ##########################################
 
         # Hello message
-        if msg_list[0] == 'hello':
+        if local_cmd and msg_list[0] == 'hello':
             # For low level device identification - hello msg
             await self.a_send(f"hello:{self.__devfid}:{self.__hwuid}")
             return True
@@ -126,60 +127,65 @@ class Shell:
             return True
 
         # Version handling
-        if msg_list[0] == 'version':
+        if local_cmd and msg_list[0] == 'version':
             # For micrOS system version info
             await self.a_send(str(Shell.MICROS_VERSION))
             return True
 
         # Reboot micropython VM
-        if msg_list[0] == 'reboot':
+        if local_cmd and msg_list[0] == 'reboot':
             hard = False
             if len(msg_list) >= 2 and "-h" in msg_list[1]:
                 # reboot / reboot -h
                 hard = True
             await self.reboot(hard)
 
-        if msg_list[0].startswith('webrepl'):
+        if local_cmd and msg_list[0].startswith('webrepl'):
             if len(msg_list) == 2 and '-u' in msg_list[1]:
                 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'):
+        if local_cmd and msg_list[0].startswith('conf'):
             self.__conf_mode = True
             return True
-        if msg_list[0].startswith('noconf'):
+        if local_cmd and msg_list[0].startswith('noconf'):
             self.__conf_mode = False
             return True
 
         # HELP MSG
-        if msg_list[0] == "help":
-            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")
+        if local_cmd and msg_list[0] == "help":
+            await self.a_send("[MICROS]")
+            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 shell session")
+            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] Configuration mode")
             await self.a_send("  conf       - Enter conf mode")
-            await self.a_send("    dump       - Dump all data")
+            await self.a_send("    dump       - Dump all data, filter: dump <str>")
             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] Task operations")
+            await self.a_send("  task list         - list tasks by tags")
             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")
+            await self.a_send("[EXEC] Command mode, syntax(...): <module> <function> <params> <postfix>")
+            await self.a_send("  Postfix hints:")
+            await self.a_send("    ... &<x>            - start one-shot task")
+            await self.a_send("    ... &&<x>           - start periodic task, where <x>: delay ms [x min: 20ms]")
+            await self.a_send("    ... >>hostname      - remote command execution (intercon)")
+            await self.a_send("    ... >json           - request json formatted output")
+            await self.a_send("  help lm           - list ALL available LoadModules")
             if "lm" in str(msg_list):
                 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:
+        if local_cmd and self.__conf_mode and len(msg_list) > 0:
             # Lock thread under config handling is threads available
             return await Shell._configure(self.a_send, msg_list)
         # @2 Command mode
@@ -249,13 +255,13 @@ class Shell:
         Dump LM modules with functions - in case of [py] files
         Dump LM module with help function call - in case of [mpy] files
         """
-        async def _help(mod):
-            for lm_path in (i for i in mod if i.startswith('LM_') and (i.endswith('py'))):
+        async def _help(mods):
+            for lm_path in mods:
                 lm_name = lm_path.replace('LM_', '').split('.')[0]
                 try:
-                    await msg_obj(f"   {lm_name}")
+                    await msg_obj(f"  {lm_name}")
                     if lm_path.endswith('.mpy'):
-                        await 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"
@@ -263,19 +269,20 @@ class Shell:
                             line = f.readline()
                             ldata = line.strip()
                             if ldata.startswith('def ') and not ldata.split()[1].startswith("_") and 'self' not in ldata:
-                                await 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:
                     await msg_obj(f"[{lm_path}] SHOW LM PARSER WARNING: {e}")
                     return False
             return True
 
+        await msg_obj("")
         # [1] list active modules (default in 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)
+            active_modules = (dir_mod for dir_mod in ilist_fs(type_filter='f', select="LM") if dir_mod.split('.')[0] in mod_keys)
             return await _help(active_modules)
         # [2] list all LMs on file system (ALL - help lm) - manual
-        return await _help(listdir())
+        return await _help(ilist_fs(type_filter='f', select="LM"))
 
     @staticmethod
     async def webrepl(msg_obj, update=False):

micrOS/source/Tasks.py

@@ -44,7 +44,7 @@ class TaskBase:
         self.out = ""                # Store task output
 
     @staticmethod
-    def is_busy(tag) -> bool:
+    def is_busy(tag:str) -> bool:
         """
         Check task is busy by tag
         :param tag: for task selection
@@ -199,12 +199,9 @@ class MagicTask(TaskBase):
         - self.__inloop: lm call type - one-shot (False) / looped (True)
         - self.__msg_buf: lm msg object redirect to variable - store lm output
         """
-        jsonify = self.__callback[-1] == '>json'
-        if jsonify:
-            self.__callback = self.__callback[:-1]
         while True:
             await self.feed(self.__sleep)
-            state, self.out = _exec_lm_core(self.__callback, jsonify)
+            state, self.out = _exec_lm_core(self.__callback)
             if not state or not self.__inloop:
                 break
         self.task_gc()    # Task pool cleanup
@@ -227,6 +224,7 @@ class Manager:
     __slots__ = ['_initialized', 'idle_counter']
     INSTANCE = None                      # Manager object
     LOAD = 0                             # CPU overload measure
+    INTERCON = None                      # Dynamic ref. for interconnect calls
 
     def __new__(cls):
         """
@@ -337,7 +335,7 @@ class Manager:
             _tasks = []
             tag_parts = tag.split('.')
             for t in TaskBase.TASKS:
-                if t.startswith(tag_parts[0]) and len(tag_parts) > 1 and tag_parts[1] == '*':
+                if len(tag_parts) > 1 and t.startswith('.'.join(tag_parts[0:-1])) and tag_parts[-1] == '*':
                     _tasks.append(t)
             if len(_tasks) == 0:
                 return []
@@ -419,19 +417,34 @@ def exec_builtins(func):
     - modules         - show active modules list
     - task kill ...   - task termination
            show ...   - task output dump
-    -  ... >json      - postfix to "jsonize" the output
+    -  ... >json      - postfix to jsonify the output
     """
-    def wrapper(arg_list, jsonify=None):
+    def wrapper(arg_list:list, jsonify=None):
         # Ensure the parameter is a list of strings
         if isinstance(arg_list, list) and arg_list:
-            # JSONIFY: [1] >json in arg_list or [2] jsonify True/False
-            json_flag = arg_list[-1] == '>json'
-            if json_flag:
-                arg_list = arg_list[:-1]
+            # Postfix operator handling
+            # ... >json               - command output format option
+            # ... >>node01.local      - intercon: command execution on remote device by hostname/IP address
+            arg_list, json_flag = (arg_list[:-1], True) if arg_list[-1] == '>json' else (arg_list, False)
+            arg_list, intercon_target = (arg_list[:-1], arg_list[-1].replace(">>", "")) if arg_list[-1].startswith('>>') else (arg_list, None)
             json_flag = jsonify if isinstance(jsonify, bool) else json_flag
+
+            # INTERCONNECT
+            if intercon_target:
+                if Manager.INTERCON is None:
+                    from InterConnect import send_cmd
+                    Manager.INTERCON = send_cmd
+                try:
+                    out = Manager.INTERCON(host=intercon_target, cmd=arg_list)
+                except Exception as e:
+                    out = {}
+                    errlog_add(f"[ERR] Intercon: {e}")
+                return True, out
+
             # MODULES
             if arg_list[0] == 'modules':
                 return True, list((m.strip().replace('LM_', '') for m in modules if m.startswith('LM_'))) + ['task']
+
             # Handle task manipulation commands: list, kill, show - return True -> Command handled
             if 'task' == arg_list[0]:
                 arg_len = len(arg_list)
@@ -448,13 +461,13 @@ def exec_builtins(func):
                     if 'show' == arg_list[1]:
                         return True, Manager.show(tag=arg_list[2])
                 return True, "Invalid task cmd! Help: task list / kill <taskID> / show <taskID>"
+
             # Call the decorated function with the additional flag
             return func(arg_list, json_flag)
     return wrapper
 
 
-@exec_builtins
-def lm_exec(arg_list, jsonify):
+def lm_exec(arg_list:list, jsonify:bool=None):
     """
     Main LM executor function with
     - async (background)
@@ -489,6 +502,7 @@ def lm_exec(arg_list, jsonify):
     return state, out
 
 
+@exec_builtins
 def _exec_lm_core(cmd_list, jsonify):
     """
     [CORE] Single command executor: MODULE.FUNCTION...
@@ -535,11 +549,12 @@ def _exec_lm_core(cmd_list, jsonify):
             # ------------ LM output format: dict(jsonify) / str(raw) ------------- #
             # Handle LM output data
             if isinstance(lm_output, dict):
-                # json True: output->json else Format dict output "human readable"
+                # jsonify (True) json output, (False) default, "human readable" output)
                 lm_output = dumps(lm_output) if jsonify else '\n'.join(
                     [f" {key}: {value}" for key, value in lm_output.items()])
             if lm_func == 'help':
-                # Special case for help command: json True: output->json else Format dict output "human readable"
+                # Special case:
+                #   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)
@@ -582,7 +597,7 @@ def exec_lm_pipe(taskstr):
         for cmd in (cmd.strip().split() for cmd in taskstr.split(';') if len(cmd) > 0):
             if len(cmd) > 0 and cmd[0].startswith("#"):
                 console_write(f"[SKIP] exec_lm_pipe: {' '.join(cmd)}")
-                return True
+                continue
             if not lm_exec(cmd)[0]:
                 errlog_add(f"[WARN] exec_lm_pipe: {cmd}")
     except Exception as e:

micrOS/source/Web.py

@@ -102,8 +102,9 @@ class WebEngine:
         cmd = url.replace('/rest', '')
         if len(cmd) > 1:
             # REST sub-parameter handling (rest commands)
-            cmd = (cmd.replace('/', ' ').replace('%22', '"').replace('%E2%80%9C', '"')
-                   .replace('%E2%80%9D', '"').replace('-', ' ').strip().split())
+            cmd = (cmd.replace('/', ' ').replace('-', ' ').replace("%3E", ">")
+                   .replace('%22', '"').replace('%E2%80%9C', '"').replace('%E2%80%9D', '"')
+                   .strip().split())
             # EXECUTE COMMAND - LoadModule
             if WebEngine.AUTH:
                 state, out = lm_exec(cmd, jsonify=True) if lm_is_loaded(cmd[0]) else (True, 'Auth:Protected')

micrOS/source/microIO.py

@@ -10,7 +10,8 @@ Designed by Marcell Ban aka BxNxM
 #                           IMPORTS                             #
 #################################################################
 from sys import platform
-from uos import listdir, uname
+from uos import uname
+from Files import ilist_fs
 from Logger import syslog
 
 #################################################################
@@ -65,7 +66,7 @@ def set_pinmap(map_data=None):
 
     # SELECT LOOKUP TABLE BASED ON PLATFORM / User input
     if isinstance(io_file, str) and io_file != 'n/a':
-        if f"IO_{io_file}" in [io.split('.')[0] for io in listdir() if io.startswith('IO_')]:
+        if f"IO_{io_file}" in [io.split('.')[0] for io in ilist_fs(type_filter='f', select="IO")]:
             PinMap.MAPPING_LUT = io_file
             return PinMap.MAPPING_LUT
     PinMap.MAPPING_LUT = detect_platform()

micrOS/source/urequests.py

@@ -197,10 +197,19 @@ async def arequest(method:str, url:str, data:str=None, json=None, headers:dict=N
     addr = _host_to_addr(host, port)
     reader, writer = None, None
 
+    # Open a connection
     try:
-        # Open a connection
         reader, writer = await asyncio.open_connection(addr[0], port, ssl=(proto == 'https:'))
+    except Exception as e:
+        # Refresh host address & reconnect
+        if "EHOSTUNREACH" in str(e):
+            addr = _host_to_addr(host, port, force=True)
+            reader, writer = await asyncio.open_connection(addr[0], port, ssl=(proto == 'https:'))
+        else:
+            errlog_add(f"[ERR] arequest connection: {e}")
 
+    # Send request + Wait for the response
+    try:
         # Build the HTTP request
         http_request = _build_request(host, method, path, headers, data, json)
 

{micrOSDevToolKit-2.9.11.dist-info → microsdevtoolkit-2.10.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 2.9.11
+Version: 2.10.5
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -31,6 +31,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: summary
@@ -494,11 +495,11 @@ Version **3.0.0-0** `micrOS-Autonomous`
     - (1) Async SSL/TLS integration (micropython 1.22+ required)                [DONE]
         - urequest module async redesign for rest clients                       [OK]
             - LM_telegram (Notify) + server (listener - chatbot)                [OK]
-    - (2) ESP-NOW (peer-to-peer communication) integration into InterCon        [PoC][TODO]
-    - (3) New intercon syntax - command level integration:                      [TODO]
+    - (2) ESP-NOW (peer-to-peer communication) integration into InterCon        [PoC:OK][TODO]
+    - (3) New intercon syntax - command level integration:                      [DONE]
     	- rgb toggle >>RingLight.local
-    	- similar as: intercon sendcmd host="RingLight.local" cmd="rgb toggle"
-    - (4) Create multi level project structure (curret is flat fs)               [TODO] FS
+    	- similar as (obsolete): intercon sendcmd host="RingLight.local" cmd="rgb toggle"
+    - (4) Create multi level project structure (curret is flat fs)               [TODO?] FS
 		- New micrOS FS structure:
 			- Note:
 				- On device (boot) micrOS Hooks.py/os_dir_fs_hook (check+correct)  [Phase1-FS:TODO]
@@ -528,6 +529,9 @@ Version **3.0.0-0** `micrOS-Autonomous`
 				- *.js
 				- *.css
 
+			- /logs
+				- still there (created runtime) 
+
 		- (5) Proper mip installer support (/lib)                                [TODO]
 			- Note: Autonomous package management over wifi (github) 
 				- pacman download
@@ -731,8 +735,6 @@ devToolKit.py -c -p '--dev BedLamp help'
       help
    dht22
         help
-   intercon
-           help
    robustness
              help
    system
@@ -862,8 +864,6 @@ BedLamp $ help
       help
    dht22
         help
-   intercon
-           help
    robustness
              help
    system
@@ -954,10 +954,9 @@ micrOS Load Module resources
 43	105	LM_lmpacman.py           (mlint: True)	(pylint: 8.38)	(ref.: 0)
 44	176	LM_gameOfLife.py         (mlint: True)	(pylint: 9.29)	(ref.: 2)
 45	58	LM_catgame.py            (mlint: True)	(pylint: 8.46)	(ref.: 0)
-46	42	LM_intercon.py           (mlint: True)	(pylint: 8.18)	(ref.: 3)
-47	43	LM_ds18.py               (mlint: True)	(pylint: 5.0)	(ref.: 2)
-48	250	LM_i2s_mic.py            (mlint: False)	(pylint: 8.71)	(ref.: 1)
-49	34	LM_sdcard.py             (mlint: True)	(pylint: 7.88)	(ref.: 0)
+46	43	LM_ds18.py               (mlint: True)	(pylint: 5.0)	(ref.: 2)
+47	250	LM_i2s_mic.py            (mlint: False)	(pylint: 8.71)	(ref.: 1)
+48	34	LM_sdcard.py             (mlint: True)	(pylint: 7.88)	(ref.: 0)
 
 SUM CODE LINES (WITH COMMENTS, WITHOUT EMPTY LINES): 6822
 ```
@@ -1048,7 +1047,6 @@ micrOS/toolkit/workspace/precompiled
     │   ├── LM_esp32.py
     │   ├── LM_genIO.mpy
     │   ├── LM_i2c.py
-    │   ├── LM_intercon.mpy
     │   ├── LM_light_sensor.mpy
     │   ├── LM_neoeffects.mpy
     │   ├── LM_neopixel.mpy