wire the broker to the compositor, containers and pointer
The four slices existed and nothing called them. Now the broker builds a
spatial container per session, reads back what the compositor actually did,
and aims the cursor into one container under a broker-wide lease.
Record schema 3 (registry.py): `container` {output, workspace, mode,
created_by, state}, `pointer` {bookmark, last_released_at, released_by} and
the compositor's `signature`. A v2 record is migrated on load, not refused —
its application is still running. Every field that could not be verified is
null; `container: null` means "no container", never "probably something".
Containers (new container_host.py, manager.py, launcher.py): `start`
allocates a slot from `WorkspaceAllocator`, runs `container_plan()`'s argv,
launches the app with the container stamp in its environment, then reads the
workspace, output and window back out of `clients -j`. Teardown removes the
output, releases the slot and reports survivors rather than claiming success
— and runs for an unprompted exit and for `gc` too, so no container is ever
left unattended. Broker start-up reconciles: adopt `hh-*` outputs a live
session claims, remove the rest, `contains_output()` being the only filter.
No IPC means `container: degraded` and lifecycle verbs unchanged.
The plans' argv are dispatched over the compositor's request socket rather
than by executing `hyprctl`, which is what hyprctl does with the same words;
the reply is checked, so a refused command is not recorded as a container.
Pointer (new driver.py, manager.py): a client for the driver's private
socket, and `pointer.acquire|move|button|click|release|state` on top of
`PointerLease`. The broker owns the lease, the driver executes. The bookmark
is marked on every move and before release and stored in the record, so it
survives a restart. On expiry `pressed()` is read before `expire()` and
`release_all` goes to the driver, because the lease cannot lift a button
itself; a sweep runs unprompted so the TTL is a promise.
containers.py to v2: `quarantine_plan()` -> `quarantine_argv()`, with the
before-any-per-session-rule ordering stated where the caller could get it
wrong. protocol.py: 9 NO_LEASE, 10 COMPOSITOR, the verb table, and the
`request_id` cache moved out of the server so the CLI agrees with it.
Tests: real AF_UNIX everywhere — a stateful fake compositor and the shipped
pointer driver behind a recording sink. No mocked sockets, no compositor, no
VM. 551 -> 693.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017mUq7QvQ9EZb2Wi35xj4cs
This commit is contained in:
1 parent
20b2aee109
commit
129430bffd
20 files changed
+4805
-89
No files matched your search
@@ -11,11 +11,15 @@ import pytest
|
||||
|
||||
from hhstreamd.clock import ManualClock
|
||||
from hhstreamd.registry import (
|
||||
ContainerState,
|
||||
Registry,
|
||||
Session,
|
||||
State,
|
||||
atomic_write_json,
|
||||
container_record,
|
||||
migrate,
|
||||
mint_id,
|
||||
pointer_record,
|
||||
)
|
||||
|
||||
|
||||
@@ -267,4 +271,103 @@ def test_derived_fields_reported_to_callers(registry: Registry):
|
||||
assert public["idle_s"] == 600.0
|
||||
assert public["expires_in_s"] == 10800.0 - 600.0
|
||||
assert public["live"] is True
|
||||
assert public["schema"] == 2
|
||||
assert public["schema"] == 3
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# schema 3: the container, the pointer and the instance signature (PLAN §7)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
def test_a_record_with_no_container_says_so_and_does_not_hint(registry: Registry):
|
||||
"""`null` is "no spatial container", never "unknown but probably something"."""
|
||||
|
||||
session = registry.add(make_session())
|
||||
public = session.public(now=1000.0)
|
||||
|
||||
assert public["container"] is None
|
||||
assert public["pointer"] is None, "absent means the pointer was never used here"
|
||||
assert public["signature"] is None
|
||||
|
||||
|
||||
def test_the_container_sub_record_keeps_every_unverified_field_null():
|
||||
"""Degraded has a *state* long before it has an output to name."""
|
||||
|
||||
degraded = container_record(
|
||||
output=None, workspace=None, mode=None, created_by="broker", state=ContainerState.DEGRADED
|
||||
)
|
||||
|
||||
assert degraded == {
|
||||
"output": None,
|
||||
"workspace": None,
|
||||
"mode": None,
|
||||
"created_by": "broker",
|
||||
"state": "degraded",
|
||||
}
|
||||
|
||||
|
||||
def test_a_container_record_round_trips_through_the_mirror(tmp_path: Path):
|
||||
registry = Registry(tmp_path, ManualClock(boottime=1000.0))
|
||||
registry.ensure_dirs()
|
||||
session = make_session(
|
||||
container=container_record(
|
||||
output="hh-foot-aaaaaa",
|
||||
workspace=1003,
|
||||
mode=(1280, 720),
|
||||
created_by="broker",
|
||||
state=ContainerState.OWNED,
|
||||
),
|
||||
pointer=pointer_record(
|
||||
bookmark={"x": 0.42, "y": 0.61, "output": "hh-foot-aaaaaa", "at": "2026-10-01T09:14:02Z"},
|
||||
last_released_at="2026-10-01T09:20:00Z",
|
||||
released_by="lease",
|
||||
),
|
||||
signature="efb5deadbeef",
|
||||
)
|
||||
registry.add(session)
|
||||
|
||||
(restored,), quarantined = Registry(tmp_path, ManualClock()).load_records()
|
||||
|
||||
assert quarantined == []
|
||||
assert restored.container["output"] == "hh-foot-aaaaaa"
|
||||
assert restored.container["mode"] == {"width": 1280, "height": 720}
|
||||
assert restored.pointer["bookmark"]["x"] == 0.42
|
||||
assert restored.signature == "efb5deadbeef"
|
||||
|
||||
|
||||
def test_a_schema_two_record_is_adopted_and_not_rejected(tmp_path: Path):
|
||||
"""Its application is still running; refusing the record would strand it."""
|
||||
|
||||
registry = Registry(tmp_path, ManualClock(boottime=1000.0))
|
||||
registry.ensure_dirs()
|
||||
old = make_session().to_dict()
|
||||
for gone in ("container", "pointer", "signature"):
|
||||
del old[gone]
|
||||
old["schema"] = 2
|
||||
atomic_write_json(registry.record_path("foot-aaaaaa"), old)
|
||||
|
||||
(restored,), quarantined = registry.load_records()
|
||||
|
||||
assert quarantined == []
|
||||
assert restored.id == "foot-aaaaaa"
|
||||
assert restored.schema == 3
|
||||
# The honest value for everything schema 3 added: the daemon that wrote
|
||||
# this record knew nothing of containers, so there is nothing to claim.
|
||||
assert (restored.container, restored.pointer, restored.signature) == (None, None, None)
|
||||
|
||||
|
||||
def test_migrating_never_overwrites_a_field_that_was_already_there():
|
||||
"""Only ever additive: the field is new to the schema, not to the session."""
|
||||
|
||||
migrated = migrate({"schema": 2, "id": "a", "container": {"state": "owned"}})
|
||||
|
||||
assert migrated["container"] == {"state": "owned"}
|
||||
assert migrated["schema"] == 3
|
||||
|
||||
|
||||
def test_a_record_from_a_newer_schema_is_read_not_guessed_at(caplog):
|
||||
with caplog.at_level("ERROR"):
|
||||
migrated = migrate({"schema": 99, "id": "a"})
|
||||
|
||||
assert migrated["schema"] == 99, "its number is not ours to rewrite"
|
||||
assert "newer than this daemon" in caplog.text
|
||||
Reference in new issue
Block a user