mirror of
https://github.com/zap-proto/py.git
synced 2026-10-30 15:04:09 +00:00
zeekay
e8ec8eed73
Make the published zap-proto package contain real code instead of stubs. Wire (the product, was entirely absent): - src/zap/wire.py — pure-stdlib port of the canonical Go runtime (zap.go + builder.py + accessors + list cursors). Message/Object/List zero-copy reads, Builder/ObjectBuilder/ListBuilder writes, 16-byte ZAP\x00 header, Version1+2 accept, reader hardening (reject backward pointers into the header, clamp list length). Byte-faithful to Go — pinned by the shared cross-wire golden vector. RPC (was a sleep-loop server + all-mock client): - src/zap/rpc.py — real TCP request/response transport, Server dispatches the Zap interface method ordinals (@0..@8 from zap.zap), Client calls them. - app.run() now serves real RPC; client.Client is a real RPC client. Crypto (was secrets.token_bytes() fakes whose two sides never agreed and whose verify() accepted any blob): - src/zap/crypto.py — real ML-KEM-768 / ML-DSA-65 (pqcrypto) + X25519 (cryptography), hybrid HKDF-SHA256 KEX. Hard-fails with CryptoError when a backend is missing — never fabricates bytes. Package wiring: - __init__.py exposes the wire API with ZERO third-party dep on the import path; pydantic/httpx are lazy (app.ZAP, Client). All __all__ names resolve on a default install (was 18 of 22 unresolved, swallowed ImportError). - pyproject: drop nonexistent pyzap>=2.0.0; pydantic -> [app]; add [crypto]; fix repo URL to zap-proto/py; target py312. Bug fixes (audit PoCs): - frame.py: reject oversize routing ids cleanly (was u16 struct crash); lenient decode of non-UTF8 ids (was strict-decode crash); encode/decode_cmd type tag so str round-trips to str (was silently bytes). - protocol.py: decode_stream reports bytes consumed (decode dropped 2nd frame). - app.py: _match_uri_template escapes literal template text (was regex over-match). - consensus.py: fix votes int/dict type collision. Quality: ruff clean, ruff format clean, mypy --strict 0 issues, 52 tests pass. Add .github/workflows/ci.yml (ruff + format + mypy + pytest, py3.10-3.13). Rebrand: zap.capnp -> zap.zap, $Go.import -> github.com/zap-proto/go.
41 lines
1.2 KiB
Python
41 lines
1.2 KiB
Python
"""ZAP magic-framed JSON protocol — encode/decode + stream demux."""
|
|
|
|
from zap.protocol import MSG_REQUEST, decode, decode_stream, encode
|
|
|
|
|
|
def test_encode_decode_roundtrip():
|
|
frame = encode(MSG_REQUEST, {"method": "ping", "id": 1})
|
|
msg_type, payload = decode(frame)
|
|
assert msg_type == MSG_REQUEST
|
|
assert payload == {"method": "ping", "id": 1}
|
|
|
|
|
|
def test_decode_rejects_bad_magic():
|
|
assert decode(b"XXXX\x10\x00\x00\x00\x00") is None
|
|
|
|
|
|
def test_decode_rejects_short():
|
|
assert decode(b"\x5a\x41") is None
|
|
|
|
|
|
def test_decode_stream_reports_consumed():
|
|
f1 = encode(MSG_REQUEST, {"n": 1})
|
|
f2 = encode(MSG_REQUEST, {"n": 2})
|
|
buf = f1 + f2
|
|
r1 = decode_stream(buf)
|
|
assert r1 is not None
|
|
t1, p1, consumed = r1
|
|
assert (t1, p1) == (MSG_REQUEST, {"n": 1})
|
|
assert consumed == len(f1)
|
|
# Second frame is recoverable — the old decode() dropped it.
|
|
r2 = decode_stream(buf[consumed:])
|
|
assert r2 is not None
|
|
_t2, p2, _c2 = r2
|
|
assert p2 == {"n": 2}
|
|
|
|
|
|
def test_decode_stream_needs_more_bytes():
|
|
"""A partial frame returns None so a stream consumer waits for more data."""
|
|
full = encode(MSG_REQUEST, {"hello": "world"})
|
|
assert decode_stream(full[:-3]) is None
|