python-mister-fpga 0.3.0__tar.gz → 0.3.2__tar.gz

{python_mister_fpga-0.3.0 → python_mister_fpga-0.3.2}/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.2
+- WebSocket reducer: a launch from the menu emits `gameRunning` before `coreRunning`; the core update no longer wipes that game. Only a switch from another core clears the stale game/system.
+
+## 0.3.1
+- Import `asyncssh` at module load. The lazy import inside `MisterSSH._ensure` ran on the event loop and made Home Assistant report blocking calls (liboqs/fido2 file reads) on the first SSH connection.
+
 ## 0.3.0
 
 Findings from reverse-engineering mrext Remote 0.4/0.5 and odelot's Main_MiSTer on a real device.

{python_mister_fpga-0.3.0 → python_mister_fpga-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-mister-fpga
-Version: 0.3.0
+Version: 0.3.2
 Summary: Async Python client for the MiSTer FPGA mrext Remote API (REST + WebSocket) and SSH telemetry
 Project-URL: Homepage, https://github.com/hudsonbrendon/python-mister-fpga
 Project-URL: Documentation, https://hudsonbrendon.github.io/python-mister-fpga/

{python_mister_fpga-0.3.0 → python_mister_fpga-0.3.2}/docs/changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.2
+- WebSocket reducer: a launch from the menu emits `gameRunning` before `coreRunning`; the core update no longer wipes that game. Only a switch from another core clears the stale game/system.
+
+## 0.3.1
+- Import `asyncssh` at module load. The lazy import inside `MisterSSH._ensure` ran on the event loop and made Home Assistant report blocking calls (liboqs/fido2 file reads) on the first SSH connection.
+
 ## 0.3.0
 
 Findings from reverse-engineering mrext Remote 0.4/0.5 and odelot's Main_MiSTer on a real device.

{python_mister_fpga-0.3.0 → python_mister_fpga-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "python-mister-fpga"
-version = "0.3.0"
+version = "0.3.2"
 description = "Async Python client for the MiSTer FPGA mrext Remote API (REST + WebSocket) and SSH telemetry"
 readme = "README.md"
 requires-python = ">=3.11"

{python_mister_fpga-0.3.0 → python_mister_fpga-0.3.2}/src/mister_fpga/__init__.py

@@ -94,4 +94,4 @@ __all__ = [
     "DEFAULT_SSH_USERNAME",
     "SSH_PROBE_CMD",
 ]
-__version__ = "0.3.0"
+__version__ = "0.3.2"

{python_mister_fpga-0.3.0 → python_mister_fpga-0.3.2}/src/mister_fpga/ssh.py

@@ -5,6 +5,8 @@ import asyncio
 import logging
 import shlex
 
+import asyncssh
+
 from .const import CMD_FIFO, SSH_PROBE_CMD
 
 _LOGGER = logging.getLogger(__name__)
@@ -41,17 +43,17 @@ def parse_ssh_probe(raw: str) -> dict:
         * ``cpu_load_1m`` (``float | None``) — 1-minute load average.
         * ``memory_used_percent`` (``float | None``) — RAM usage 0–100.
         * ``firmware_timestamp`` (``int | None``) — mtime of the MiSTer binary.
-        * ``cmd_fifo_pending`` (``int | None``) — bytes Main has not read from
-          ``/dev/MiSTer_cmd``.  Non-zero on two consecutive probes means Main
-          is hung (e.g. a core stopped answering the SPI handshake).
-        * ``main_open_fds`` (``int | None``) — open descriptors of the Main
-          process.  Some builds leak one per core load; 1024 is the limit.
+        * ``cmd_fifo_pending`` (``int | None``) — unread command-FIFO bytes.
+        * ``main_open_fds`` (``int | None``) — open descriptors of Main.
         * ``volume`` (``int | None``) — 0-7, 7 loudest.
         * ``muted`` (``bool | None``).
-        * ``game_id`` (``str | None``) — CRC32 or disc serial of the loaded game.
+        * ``game_id`` (``str | None``) — CRC32 or disc serial of the game.
         * ``sam_active`` (``bool | None``) — Super Attract Mode is cycling.
-        * ``sam_game`` (``str | None``) — game SAM is showing, e.g.
-          ``"Breakers (neogeo)"``.
+        * ``sam_game`` (``str | None``) — game SAM shows, e.g. ``Breakers (neogeo)``.
+
+        ``cmd_fifo_pending`` above zero on two probes in a row means Main is
+        hung (its loop also drains ``/dev/MiSTer_cmd``).  Some Main builds
+        leak one descriptor per core load; the limit is 1024.
     """
     parts = [p.strip() for p in raw.split(_SEP)]
     while len(parts) < 11:
@@ -148,8 +150,6 @@ class MisterSSH:
     async def _ensure(self) -> None:
         if self._conn is not None:
             return
-        import asyncssh
-
         self._conn = await asyncssh.connect(
             self.host,
             port=self.port,

{python_mister_fpga-0.3.0 → python_mister_fpga-0.3.2}/src/mister_fpga/websocket.py

@@ -72,8 +72,9 @@ def apply_ws_message(
 
     Understood prefixes (``prefix:rest``):
 
-    * ``coreRunning`` — updates :attr:`~mister_fpga.MisterStatus.core`; a new
-      core clears the (now stale) system and game fields.
+    * ``coreRunning`` — updates :attr:`~mister_fpga.MisterStatus.core`;
+      switching from another core clears the stale system and game fields
+      (a launch from the menu sends ``gameRunning`` first, so that is kept).
     * ``gameRunning`` — updates :attr:`~mister_fpga.MisterStatus.game` and
       :attr:`~mister_fpga.MisterStatus.game_name` (``<system>/<file>``, or the
       bare core name for arcade).
@@ -104,6 +105,9 @@ def apply_ws_message(
             )
         if core == status.core:
             return status, menu_path, index_state
+        if status.core is None:
+            # On launch mrext sends gameRunning before coreRunning; keep the game.
+            return replace(status, core=core), menu_path, index_state
         return (
             replace(
                 status, core=core, system=None, system_name=None,

{python_mister_fpga-0.3.0 → python_mister_fpga-0.3.2}/tests/test_ra.py

@@ -160,4 +160,4 @@ def test_public_exports():
     assert hasattr(mister_fpga, "MisterRAStatus")
     assert hasattr(mister_fpga, "MisterRAError")
     assert hasattr(mister_fpga, "RA_SUPPORTED_SYSTEMS")
-    assert mister_fpga.__version__ == "0.3.0"
+    assert mister_fpga.__version__ == "0.3.2"

{python_mister_fpga-0.3.0 → python_mister_fpga-0.3.2}/tests/test_ra_web.py

@@ -254,7 +254,7 @@ async def test_validate_success_and_failure():
 
 
 def test_top_level_exports():
-    assert mister_fpga.__version__ == "0.3.0"
+    assert mister_fpga.__version__ == "0.3.2"
     assert hasattr(mister_fpga, "MisterRAWeb")
     assert hasattr(mister_fpga, "MisterRAWebError")
     assert hasattr(mister_fpga, "MisterRAWebStats")

{python_mister_fpga-0.3.0 → python_mister_fpga-0.3.2}/tests/test_websocket.py

@@ -111,3 +111,12 @@ def test_parse_index_status_progress():
     assert (idx.total_steps, idx.current_step) == (10, 3)
     assert idx.description == "Indexing SNES, part 2"
     assert parse_index_status("y,n,0,0,").indexing is False
+
+
+def test_core_after_game_on_launch_keeps_game():
+    # mrext order on launch: coreRunning: -> gameRunning:SNES/x -> coreRunning:SNES
+    status = MisterStatus(online=True, core="sf2")
+    for frame in ("coreRunning:", "gameRunning:SNES/x.sfc", "coreRunning:SNES"):
+        status, _, _ = apply_ws_message(frame, status, None, (False, False))
+    assert status.core == "SNES"
+    assert status.game_name == "x"