yrcom 0.2.0__tar.gz → 0.3.0__tar.gz

{yrcom-0.2.0/src/yrcom.egg-info → yrcom-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yrcom
-Version: 0.2.0
+Version: 0.3.0
 Summary: Yaskawa robot communication — Ethernet Server, HSES and HSES File Control (pure stdlib)
 Author: cmosbk
 License: MIT
@@ -109,4 +109,4 @@ and a small HSES capture fixture (`tests/fixtures/`).
 
 ## License
 
-MIT — see [LICENSE](LICENSE).
+MIT — see [LICENSE](https://github.com/CMOSBK/yrcom/blob/main/LICENSE).

{yrcom-0.2.0 → yrcom-0.3.0}/README.md

@@ -93,4 +93,4 @@ and a small HSES capture fixture (`tests/fixtures/`).
 
 ## License
 
-MIT — see [LICENSE](LICENSE).
+MIT — see [LICENSE](https://github.com/CMOSBK/yrcom/blob/main/LICENSE).

{yrcom-0.2.0 → yrcom-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "yrcom"
-version = "0.2.0"
+version = "0.3.0"
 description = "Yaskawa robot communication — Ethernet Server, HSES and HSES File Control (pure stdlib)"
 readme = "README.md"
 requires-python = ">=3.11"

{yrcom-0.2.0 → yrcom-0.3.0}/src/yrcom/__init__.py

@@ -32,8 +32,15 @@ from .robot_connection import (
     TCP_PORT,
 )
 from .hses_sim import HsesReplayServer
+from .hses_server_codec import (
+    ServerCommand,
+    MalformedRequest,
+    decode_request,
+    encode_response,
+    encode_error,
+)
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"
 
 __all__ = [
     "YaskawaClient", "VarType", "EthernetServerClient",
@@ -45,4 +52,5 @@ __all__ = [
     "RobotConnection", "PersistentTcpClient", "HsesWriteBlockedError",
     "TRANSPORT_HSES", "TRANSPORT_ETHERNET", "HSES_PORT", "TCP_PORT",
     "HsesReplayServer",
+    "ServerCommand", "MalformedRequest", "decode_request", "encode_response", "encode_error",
 ]

yrcom-0.3.0/src/yrcom/hses_server_codec.py

@@ -0,0 +1,93 @@
+"""
+Server-side HSES codec — the mirror image of hses_client.py's request
+builder/response parser. Decodes incoming request bytes into a
+ServerCommand; encodes results back into wire bytes.
+
+Wire header is the 32-byte YERC header, identical in both directions:
+    0:4    magic "YERC"
+    4:6    header size (u16, always 32)
+    6:8    data size (u16)
+    8      Reserve1 (0x03 fixed)
+    9      processing division (1 = robot control)
+    10     ACK (0 = request, 1 = response)
+    11     request id (echoed back)
+    12:16  block number
+    16:24  Reserve2 ("99999999" fixed)
+    24:26  command (u16) — in a response this is the ECHOED command
+    26:28  request: instance (u16)   | response: status (byte) + pad
+    28     request: attribute (byte) | response: added-status size (byte)
+    29     request: service (byte)   | response: pad
+    30:32  request: padding          | response: added-status word (u16)
+"""
+from __future__ import annotations
+
+import struct
+from dataclasses import dataclass
+
+_MAGIC = b"YERC"
+_HDR_SIZE = 0x0020
+
+
+@dataclass(frozen=True)
+class ServerCommand:
+    cmd: int
+    instance: int
+    attribute: int
+    service: int
+    req_id: int
+    payload: bytes
+
+
+class MalformedRequest(Exception):
+    """Raw bytes are too short, or the header magic/size doesn't match."""
+
+
+def decode_request(raw: bytes) -> ServerCommand:
+    if len(raw) < _HDR_SIZE:
+        raise MalformedRequest(f"request too short: {len(raw)} B")
+    if raw[0:4] != _MAGIC:
+        raise MalformedRequest(f"bad magic: {raw[0:4]!r}")
+    data_size = struct.unpack_from("<H", raw, 6)[0]
+    req_id = raw[11]
+    cmd = struct.unpack_from("<H", raw, 24)[0]
+    instance = struct.unpack_from("<H", raw, 26)[0]
+    attribute = raw[28]
+    service = raw[29]
+    payload = raw[_HDR_SIZE:_HDR_SIZE + data_size]
+    return ServerCommand(cmd=cmd, instance=instance, attribute=attribute,
+                          service=service, req_id=req_id, payload=payload)
+
+
+def _response_header(cmd: int, req_id: int, data_size: int) -> bytearray:
+    hdr = bytearray(_HDR_SIZE)
+    hdr[0:4] = _MAGIC
+    struct.pack_into("<H", hdr, 4, _HDR_SIZE)
+    struct.pack_into("<H", hdr, 6, data_size)
+    hdr[8] = 0x03
+    hdr[9] = 1          # processing division: robot control
+    hdr[10] = 0x01       # ACK = response
+    hdr[11] = req_id
+    struct.pack_into("<I", hdr, 12, 0)
+    hdr[16:24] = b"99999999"
+    struct.pack_into("<H", hdr, 24, cmd)
+    return hdr
+
+
+def encode_response(cmd: int, req_id: int, data: bytes = b"") -> bytes:
+    """Success response (status 0x00, no added-status)."""
+    hdr = _response_header(cmd, req_id, len(data))
+    hdr[26] = 0x00   # status
+    hdr[27] = 0
+    hdr[28] = 0       # added-status size
+    struct.pack_into("<H", hdr, 30, 0)
+    return bytes(hdr) + data
+
+
+def encode_error(cmd: int, req_id: int, status: int, added: int = 0) -> bytes:
+    """Error response — empty data, given status/added-status."""
+    hdr = _response_header(cmd, req_id, 0)
+    hdr[26] = status
+    hdr[27] = 0
+    hdr[28] = 1 if added else 0
+    struct.pack_into("<H", hdr, 30, added)
+    return bytes(hdr)

{yrcom-0.2.0 → yrcom-0.3.0/src/yrcom.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yrcom
-Version: 0.2.0
+Version: 0.3.0
 Summary: Yaskawa robot communication — Ethernet Server, HSES and HSES File Control (pure stdlib)
 Author: cmosbk
 License: MIT
@@ -109,4 +109,4 @@ and a small HSES capture fixture (`tests/fixtures/`).
 
 ## License
 
-MIT — see [LICENSE](LICENSE).
+MIT — see [LICENSE](https://github.com/CMOSBK/yrcom/blob/main/LICENSE).

{yrcom-0.2.0 → yrcom-0.3.0}/src/yrcom.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ src/yrcom/__init__.py
 src/yrcom/hses_client.py
 src/yrcom/hses_errors.py
 src/yrcom/hses_file.py
+src/yrcom/hses_server_codec.py
 src/yrcom/hses_sim.py
 src/yrcom/robot_connection.py
 src/yrcom/yaskawa_client.py
@@ -16,6 +17,7 @@ src/yrcom.egg-info/requires.txt
 src/yrcom.egg-info/top_level.txt
 tests/test_hses_client.py
 tests/test_hses_file.py
+tests/test_hses_server_codec.py
 tests/test_hses_sim.py
 tests/test_robot_connection.py
 tests/test_yaskawa_client.py

yrcom-0.3.0/tests/test_hses_server_codec.py

@@ -0,0 +1,74 @@
+"""Pure protocol-logic tests — no sockets, no MotoSim. Builds real request
+bytes via HsesClient._build (the verified client-side packer) and checks the
+new server-side decoder reads them back correctly."""
+from __future__ import annotations
+
+import pytest
+
+from yrcom.hses_client import HsesClient
+from yrcom.hses_server_codec import MalformedRequest, ServerCommand, decode_request
+
+
+def test_decode_matches_a_real_status_request():
+    raw = HsesClient._build(cmd=0x72, instance=1, attribute=0, service=0x01, req_id=5)
+    sc = decode_request(raw)
+    assert sc == ServerCommand(cmd=0x72, instance=1, attribute=0, service=0x01,
+                                req_id=5, payload=b"")
+
+
+def test_decode_carries_payload():
+    raw = HsesClient._build(cmd=0x7A, instance=3, attribute=1, service=0x10,
+                             req_id=200, payload=b"\x2a\x00\x00\x00")
+    sc = decode_request(raw)
+    assert sc.cmd == 0x7A
+    assert sc.instance == 3
+    assert sc.payload == b"\x2a\x00\x00\x00"
+
+
+def test_decode_rejects_short_input():
+    with pytest.raises(MalformedRequest):
+        decode_request(b"too short")
+
+
+def test_decode_rejects_bad_magic():
+    raw = bytearray(HsesClient._build(cmd=0x72, instance=1, attribute=0,
+                                       service=0x01, req_id=1))
+    raw[0:4] = b"XXXX"
+    with pytest.raises(MalformedRequest):
+        decode_request(bytes(raw))
+
+
+def test_encode_response_round_trips_through_real_client_parser():
+    # HsesClient._parse_resp is the real, hardware-verified response parser —
+    # proving our encoder's bytes satisfy it is the strongest test we have
+    # without a socket.
+    from yrcom.hses_client import HsesClient
+    from yrcom.hses_server_codec import encode_response
+
+    raw = encode_response(cmd=0x72, req_id=9, data=b"\x01\x00\x00\x00\x00\x00\x00\x00")
+    resp = HsesClient._parse_resp(raw)
+    assert resp.cmd == 0x72
+    assert resp.status == 0x00
+    assert resp.added == 0
+    assert resp.data == b"\x01\x00\x00\x00\x00\x00\x00\x00"
+
+
+def test_encode_error_round_trips_and_raises_hses_error():
+    from yrcom.hses_client import HsesClient, HsesError
+    from yrcom.hses_server_codec import encode_error
+
+    raw = encode_error(cmd=0x75, req_id=1, status=0x1F, added=0xB005)
+    resp = HsesClient._parse_resp(raw)
+    assert resp.status == 0x1F
+    assert resp.added == 0xB005
+    assert resp.data == b""
+
+
+def test_encode_error_without_added_status():
+    from yrcom.hses_client import HsesClient
+    from yrcom.hses_server_codec import encode_error
+
+    raw = encode_error(cmd=0x00, req_id=1, status=0x08)
+    resp = HsesClient._parse_resp(raw)
+    assert resp.status == 0x08
+    assert resp.added == 0