runtimepy 5.15.0__py3-none-any.whl → 5.15.1__py3-none-any.whl

runtimepy/__init__.py

@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
 # version=3.2.3
-# hash=58f166da9bc0561c671ef04c334d585d
+# hash=7da25db9f79bc00e444a7898020e2a26
 # =====================================
 
 """
@@ -10,7 +10,7 @@ Useful defaults and other package metadata.
 
 DESCRIPTION = "A framework for implementing Python services."
 PKG_NAME = "runtimepy"
-VERSION = "5.15.0"
+VERSION = "5.15.1"
 
 # runtimepy-specific content.
 METRICS_NAME = "metrics"

runtimepy/data/dummy_load.yaml

@@ -85,6 +85,9 @@ structs:
 
   - name: example.struct3
     factory: sample_struct
+    config:
+      js_uris:
+        - package://runtimepy/js/sample.js
 
 # Sample peer processes.
 processes:

runtimepy/data/js/sample.js

@@ -0,0 +1 @@
+console.log(`sample.js included (${tab.name})`);

runtimepy/net/connection.py

@@ -250,9 +250,9 @@ class Connection(
             await backoff.sleep()
             if await self.restart():
                 self._set_enabled(True)
-                self._restarts.raw.value += 1
+                self._restarts.increment()
 
-            self._restart_attempts.raw.value += 1
+            self._restart_attempts.increment()
 
     @asynccontextmanager
     async def process_then_disable(self, **kwargs) -> AsyncIterator[None]:

runtimepy/net/server/app/env/__init__.py

@@ -40,6 +40,7 @@ def populate_tabs(app: AppInfo, tabs: TabbedContent) -> None:
             tabs,
             icon="arrow-repeat",
             markdown=task.markdown,
+            js_uris=task.config.get("js_uris", []),
         ).entry()
 
     # Struct tabs.
@@ -51,6 +52,7 @@ def populate_tabs(app: AppInfo, tabs: TabbedContent) -> None:
             tabs,
             icon="bucket",
             markdown=struct.markdown,
+            js_uris=struct.config.get("js_uris", []),
         ).entry()
 
     # Subprocess tabs.

runtimepy/net/server/app/env/tab/base.py

@@ -28,12 +28,13 @@ class ChannelEnvironmentTabBase(Tab, LoggerMixin, MarkdownMixin):
         tabs: TabbedContent,
         icon: str = "alarm",
         markdown: str = None,
+        **kwargs,
     ) -> None:
         """Initialize this instance."""
 
         self.command = command
         self.set_markdown(markdown=markdown, package=PKG_NAME)
-        super().__init__(name, app, tabs, source="env", icon=icon)
+        super().__init__(name, app, tabs, source="env", icon=icon, **kwargs)
 
         # Logging.
         LoggerMixin.__init__(self, logger=self.command.logger)

runtimepy/net/server/app/tab.py

@@ -4,7 +4,7 @@ A module implementing an application tab interface.
 
 # built-in
 from io import StringIO
-from typing import cast
+from typing import Iterable, cast
 
 # third-party
 from svgen.element import Element
@@ -29,6 +29,7 @@ class Tab:
         source: str = None,
         subdir: str = "tab",
         icon: str = None,
+        js_uris: Iterable[str] = None,
     ) -> None:
         """Initialize this instance."""
 
@@ -46,6 +47,10 @@ class Tab:
         button_str += self.name
         self.button.text = button_str
 
+        if not js_uris:
+            js_uris = []
+        self.js_uris: list[str] = list(js_uris)
+
         self.init()
 
         self.compose(self.content)
@@ -59,8 +64,12 @@ class Tab:
     def write_js(self, writer: IndentedFileWriter, **kwargs) -> bool:
         """Write JavaScript code for the tab."""
 
-        return write_found_file(
-            writer, kind_url("js", self.source, subdir=self.subdir, **kwargs)
+        return all(
+            write_found_file(writer, uri)
+            for uri in [
+                kind_url("js", self.source, subdir=self.subdir, **kwargs)
+            ]
+            + self.js_uris
         )
 
     def entry(self) -> None:

runtimepy/net/server/markdown.py

@@ -9,7 +9,9 @@ from typing import Iterable, cast
 
 # third-party
 from vcorelib.io.file_writer import IndentedFileWriter
+from vcorelib.math.time import byte_count_str
 from vcorelib.paths import rel
+from vcorelib.paths import stats as _stats
 
 LOGO_MARKDOWN = "[![logo](/static/png/chip-circle-bootstrap/128x128.png)](/)"
 DIR_FILE = "dir.html"
@@ -46,6 +48,8 @@ def markdown_for_dir(
             if curr_dir != Path():
                 writer.write(f"* [..](/{curr_dir.parent}/{DIR_FILE})")
 
+            writer.write("| name | size |")
+            writer.write("|------|------|")
             for item in sorted(path.iterdir()):
                 curr = rel(item, base=base)
 
@@ -53,7 +57,14 @@ def markdown_for_dir(
                 if item.is_dir():
                     name = f"**{name}**"
 
-                writer.write(f"* [{name}](/{curr})")
+                stats = _stats(item)
+                assert stats
+                size_str = (
+                    byte_count_str(stats.st_size) if item.is_file() else ""
+                )
+                writer.write(f"| [{name}](/{curr}) | {size_str} |")
+
+            writer.empty()
 
         result: str = cast(StringIO, writer.stream).getvalue()
 

runtimepy/net/websocket/connection.py

@@ -29,6 +29,7 @@ from websockets.asyncio.server import serve as _serve
 from websockets.exceptions import ConnectionClosed as _ConnectionClosed
 
 # internal
+from runtimepy.net import normalize_host as _normalize_host
 from runtimepy.net import sockname as _sockname
 from runtimepy.net.connection import Connection
 from runtimepy.net.connection import EchoConnection as _EchoConnection
@@ -64,7 +65,13 @@ class WebsocketConnection(Connection):
         """Initialize this connection."""
 
         self.protocol = protocol
-        super().__init__(self.protocol.logger, **kwargs)
+        super().__init__(
+            _getLogger(
+                f"W {_normalize_host(*self.protocol.local_address)} -> "
+                f"{_normalize_host(*self.protocol.remote_address)}"
+            ),
+            **kwargs,
+        )
 
         # Store connection-instantiation arguments (for connection restarting).
         self._uri: str = ""

{runtimepy-5.15.0.dist-info → runtimepy-5.15.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runtimepy
-Version: 5.15.0
+Version: 5.15.1
 Summary: A framework for implementing Python services.
 Home-page: https://github.com/libre-embedded/runtimepy
 Author: Libre Embedded
@@ -17,11 +17,11 @@ Classifier: Development Status :: 5 - Production/Stable
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: vcorelib>=3.6.2
 Requires-Dist: websockets
-Requires-Dist: psutil
 Requires-Dist: svgen>=0.8.0
 Requires-Dist: aiofiles
-Requires-Dist: vcorelib>=3.6.2
+Requires-Dist: psutil
 Provides-Extra: test
 Requires-Dist: pylint; extra == "test"
 Requires-Dist: flake8; extra == "test"
@@ -51,11 +51,11 @@ Dynamic: requires-python
     =====================================
     generator=datazen
     version=3.2.3
-    hash=db8f45762873863c99d4d7d8f996d2fb
+    hash=21dc494ffe783ac9edf7769c4d5aa21e
     =====================================
 -->
 
-# runtimepy ([5.15.0](https://pypi.org/project/runtimepy/))
+# runtimepy ([5.15.1](https://pypi.org/project/runtimepy/))
 
 [![python](https://img.shields.io/pypi/pyversions/runtimepy.svg)](https://pypi.org/project/runtimepy/)
 ![Build Status](https://github.com/libre-embedded/runtimepy/workflows/Python%20Package/badge.svg)

{runtimepy-5.15.0.dist-info → runtimepy-5.15.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-runtimepy/__init__.py,sha256=b_ptd8WNjZK1zK_FHN2DmLkBIzyqoGLd67n3xangX6g,391
+runtimepy/__init__.py,sha256=fFFYCw5EFe16Vfqrut6lO_EODvjbdb7fbzjzBldFfq4,391
 runtimepy/__main__.py,sha256=IKioH2xOtsXwrwb9zABDQEJvuAX--Lnh84TeSz0XSs0,332
 runtimepy/app.py,sha256=Er1ZKKrG9U0FV0gQg_GYF9xDb89HgYnVzS5SjxGa2Tg,970
 runtimepy/dev_requirements.txt,sha256=VZhW6bJ5YbwaoN4d_XxZFuN5BbDLaG7ngKrGnugVPRw,245
@@ -45,7 +45,7 @@ runtimepy/control/env/__init__.py,sha256=RHJqysY7Pv4VDs2SGk0X-qc5xp_SrQ_oxb5Deug
 runtimepy/data/404.md,sha256=_yzjvp2GeMc5OBvZX2zDbX-Ns6T7HCO9esRbS5PmkXU,397
 runtimepy/data/base.yaml,sha256=PEsvcMV1qFb1Gr6Cx2SgmR6ScfPyuu3yTdnvSBTVSdA,453
 runtimepy/data/browser.yaml,sha256=oc5KEV1C1uAJ4MkhNo4hyVVfJtZvHelRNqzNvD313Ow,79
-runtimepy/data/dummy_load.yaml,sha256=BVzCn7CmvcSNcDNWWYoAdil3-YQMdxuwTOCh2dpRR5s,2001
+runtimepy/data/dummy_load.yaml,sha256=oAuccgvM3lDoN5RZBo4UECiegxzOgpllBfXXwZ5odCw,2071
 runtimepy/data/factories.yaml,sha256=CdpnjK2glj8HewI2tFSNvCSUdcNPeVD_tFbGy2QBSQg,1952
 runtimepy/data/favicon.ico,sha256=boxAGaHbUjMFrOO2TZpsO0nIRC-LUgwHVQYOiG1YQnM,362870
 runtimepy/data/sample_telemetry.yaml,sha256=OpdFurkvtWJGaNl9LMlU2rKo15AaVVr-U_hoZfsbp-Y,695
@@ -63,6 +63,7 @@ runtimepy/data/js/events.js,sha256=rgz3Q_8J6sfU_7Sa7fG1mZD0pQ4S3vwN2mqcvQfePkM,5
 runtimepy/data/js/init.js,sha256=6RhwGRl_DBjMpztms2JOQiQlvdizcLeaiETNEh31KyU,1992
 runtimepy/data/js/main.js,sha256=nYIQ6O76EWqlzwX7oEwPXqC-LCUFCZYDADK9QbYRDKk,404
 runtimepy/data/js/markdown_page.js,sha256=R7Z2CwCk0dXED_4lwvDMXRNNB9ki9RvfwEKLPSwNWec,982
+runtimepy/data/js/sample.js,sha256=Q8UhPKNNrkQ7yFd5p1xqWNerVJ-s8WHJSAYn2ohUkNE,49
 runtimepy/data/js/util.js,sha256=Xc8pHUiFDBDvIqTamWrCYUOpF7iR9VNvPDCSCQAfLDA,1424
 runtimepy/data/js/worker.js,sha256=V9deGAynjvUr1D-WGi3wUW8rxoaNLvBvayMoLFZk3w0,2444
 runtimepy/data/js/classes/App.js,sha256=t3XVC7zSi8L_sMJ4KP-lyWyuD4cysCKkptN-lgjewN8,5159
@@ -158,7 +159,7 @@ runtimepy/mixins/regex.py,sha256=kpCj4iL1akzt_KPPiMP-bTbuLBHOpkUrwbCTRe8HSUk,106
 runtimepy/mixins/trig.py,sha256=vkDd9Rh8080gvH5OHkSYmjImVgM_ZZ7RzMxsczKx5N4,2480
 runtimepy/net/__init__.py,sha256=HQaWGxnEH49JSPX2Q_N5QNSV0Wd_x0zZQJa1SV1EC_M,790
 runtimepy/net/backoff.py,sha256=IVloxQd-gEK62gFAlU2aOwgTEXhsNUTBfS16eiOqKG8,1080
-runtimepy/net/connection.py,sha256=5rjdfqq58DU5XW5eaZgkO8vIjENYiNLtzE7iV1uWvxk,12878
+runtimepy/net/connection.py,sha256=GZ9rZP7wgUUYWmyL4FGbJzhqb1uNWCQAsNbXSGzoHAw,12872
 runtimepy/net/manager.py,sha256=-M-ZSB9izay6HK1ytTayAYnSHYAz34dcwxaiNhC4lWg,4264
 runtimepy/net/mixin.py,sha256=0NTKeuaoUNm7--GzA7rxU3gb1rrGGhu1vNj6mek4dDA,3022
 runtimepy/net/mtu.py,sha256=XnLXAFMsDxK1Lj5v_zgWaBrC3lNqf81DkbDc6hpMdmI,3495
@@ -200,7 +201,7 @@ runtimepy/net/http/version.py,sha256=mp6rgIM7-VUVKLCA0Uw96CmBkL0ET860lDVVEewpZ7w
 runtimepy/net/server/__init__.py,sha256=5KalIcOWv8lYm8747pq2rzGwpLz713XdHuQIKbWJsXc,11649
 runtimepy/net/server/html.py,sha256=OB2K37kA7MHtcKqp0pZE1q_XgiyvfooigzS0-OQFCCM,1900
 runtimepy/net/server/json.py,sha256=AaMPw-G-7xX67mf1LvQAipNdwrnmbLDunVlkWf6iOz0,2526
-runtimepy/net/server/markdown.py,sha256=AvwWQg7DgMSroOxNN0KEKwpPoLueNvv2GSBdPzQbMvI,1734
+runtimepy/net/server/markdown.py,sha256=UIJ9R9WM5XodPs8WEevFNJ3LX9tMevhUe8QKKdeY4ak,2143
 runtimepy/net/server/mux.py,sha256=ejET7NpJzzJjkVwR8laSuZYR79DOT3XazmAIm6rENSE,598
 runtimepy/net/server/app/__init__.py,sha256=0eCcqYvmby_wQTGqAiGbGM5LCxKM2qpjuIT0gLHsoDU,3157
 runtimepy/net/server/app/base.py,sha256=46aOqZwRss_nh_WfEH1cMJ9GUVoLJjERd7cTRFu6mXE,1878
@@ -211,13 +212,13 @@ runtimepy/net/server/app/landing_page.py,sha256=9TXpL0ITYWCxw9Potq71ZOwLlIlMegcK
 runtimepy/net/server/app/placeholder.py,sha256=OuiMNvLEK0pI2N3oIqvPRaperoJkDg-fBds9HHfuosg,1664
 runtimepy/net/server/app/pyodide.py,sha256=dGJ4u78eYQLU9RQbZEWgzv-7jVIwblS6VopibG82tA4,478
 runtimepy/net/server/app/sound.py,sha256=qG2k00nWRPAmI5_4L_LMs10nsCTBKaAzIp80embgua8,837
-runtimepy/net/server/app/tab.py,sha256=gRiaUJdB3V9hIKI5MksW7spNChfMtEMDFWCTP1ERrZ4,2272
-runtimepy/net/server/app/env/__init__.py,sha256=IYk_DuedEQRp1rzKCi1FT4xks_RI-XGTsWh5zJtZkYc,4771
+runtimepy/net/server/app/tab.py,sha256=N4NYvxeo0fllb404aCHn7YKhlY6ZnG6G4HBiMS17qQY,2510
+runtimepy/net/server/app/env/__init__.py,sha256=vgiPIYkitx0aqtmgG_nkOehDM7vrQJHYkhRsGCP8pU8,4877
 runtimepy/net/server/app/env/modal.py,sha256=HTipCYgQaAUtsmlBjXKfhAM5JyhLqoIIwEwsPnKhrG8,1740
 runtimepy/net/server/app/env/settings.py,sha256=m87hHAapuNq0xKzDNSNTwG8D2Cb3QFSVrziszf8iVHs,1631
 runtimepy/net/server/app/env/widgets.py,sha256=sDfJYBVIXZuly4Rvch597Y-LTT6t3obxc60oejqGv7g,7104
 runtimepy/net/server/app/env/tab/__init__.py,sha256=stTVKyHljLQWnnhxkWPwa7bLdZtjhiMFbiVFgbiYaFI,647
-runtimepy/net/server/app/env/tab/base.py,sha256=QBTBBvsdihbzK5MqrJBf6K5N61b3i8Ms0P6Xq_h1mbs,1171
+runtimepy/net/server/app/env/tab/base.py,sha256=mljE6n56HUwcWO1lrjj5PR7qh5dvY8CZYMwDcrV-yVk,1199
 runtimepy/net/server/app/env/tab/controls.py,sha256=11TidvphKyvLCgdW8Sjiyd6BpX4-ybGZPEhrn-hzkuU,8263
 runtimepy/net/server/app/env/tab/html.py,sha256=MbEQzxEPNcMCntGGm2qWli6ND_Ina46CEVzt7HF2yBg,8210
 runtimepy/net/server/app/env/tab/message.py,sha256=-J8wBo1KH0XoBi9VcUvl9LXZCaoFAmvFyMf_YFJVF6Q,3945
@@ -248,7 +249,7 @@ runtimepy/net/udp/tftp/endpoint.py,sha256=so60LdPTG66N5tdhHhiX7j_TBHvNOTi4JIgLcg
 runtimepy/net/udp/tftp/enums.py,sha256=06juMd__pJZsyL8zO8p3hRucnOratt1qtz9zcxzMg4s,1579
 runtimepy/net/udp/tftp/io.py,sha256=w6cnUt-T-Ma6Vg8BWoRbsNnIWUv0HTY4am6bcLWxNJs,803
 runtimepy/net/websocket/__init__.py,sha256=YjSmoxiigmsI_hcQw6nueX7bxhrRGerEERnPvgLVEVA,313
-runtimepy/net/websocket/connection.py,sha256=VS1ifMrpIOiqvUakZWSGypqTZEWTMXhjRDiGMJ2gkZs,10129
+runtimepy/net/websocket/connection.py,sha256=THrqy_WmwFuiNkojQ6pTUhBTJdokvWbH-3DsB96zCLU,10370
 runtimepy/noise/__init__.py,sha256=EJM7h3t_z74wwrn6FAFQwYE2yUcOZQ1K1IQqOb8Z0AI,384
 runtimepy/primitives/__init__.py,sha256=g5IK6e_UZuGhj9QNYoCn5TbhNatWX0nEYUs-JzsOizQ,2618
 runtimepy/primitives/base.py,sha256=6N_mfTuv0RJJYofSQQ858vJfgcTvjjvfXeebMw_1bw8,9339
@@ -305,9 +306,9 @@ runtimepy/tui/task.py,sha256=nUZo9fuOC-k1Wpqdzkv9v1tQirCI28fZVgcC13Ijvus,1093
 runtimepy/tui/channels/__init__.py,sha256=evDaiIn-YS9uGhdo8ZGtP9VK1ek6sr_P1nJ9JuSET0o,4536
 runtimepy/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 runtimepy/ui/controls.py,sha256=L55Af-4vGq6ZHewdoA7C_mAYq35WXl8NzOdcsmQIo7M,1868
-runtimepy-5.15.0.dist-info/licenses/LICENSE,sha256=yKBRwbO-cOPBrlpsZmJkkSa33DfY31aE8t7lZ0DwlUo,1071
-runtimepy-5.15.0.dist-info/METADATA,sha256=Hr1TYcveiC09pGHx5nro_VVvBfy3y1upL9vOgyTO0p4,9268
-runtimepy-5.15.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-runtimepy-5.15.0.dist-info/entry_points.txt,sha256=-btVBkYv7ybcopqZ_pRky-bEzu3vhbaG3W3Z7ERBiFE,51
-runtimepy-5.15.0.dist-info/top_level.txt,sha256=0jPmh6yqHyyJJDwEID-LpQly-9kQ3WRMjH7Lix8peLg,10
-runtimepy-5.15.0.dist-info/RECORD,,
+runtimepy-5.15.1.dist-info/licenses/LICENSE,sha256=yKBRwbO-cOPBrlpsZmJkkSa33DfY31aE8t7lZ0DwlUo,1071
+runtimepy-5.15.1.dist-info/METADATA,sha256=3j48z5hnAIZFf5Nf3sQNIHAmDou7FrpFtm9YAwy6MD8,9268
+runtimepy-5.15.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+runtimepy-5.15.1.dist-info/entry_points.txt,sha256=-btVBkYv7ybcopqZ_pRky-bEzu3vhbaG3W3Z7ERBiFE,51
+runtimepy-5.15.1.dist-info/top_level.txt,sha256=0jPmh6yqHyyJJDwEID-LpQly-9kQ3WRMjH7Lix8peLg,10
+runtimepy-5.15.1.dist-info/RECORD,,