mirror of
https://github.com/pyMC-dev/pyMC_Repeater.git
synced 2026-10-31 04:01:59 +01:00
merge: reconcile companion cleanup with fix-general-tidy
Merge the maintainer's fix-general-tidy branch (neighbor discovery, keygen, API endpoints, web-asset rebuild, HTTP server config/control commands, and an independent #286 room-server push/ACK/guest fix) into the companion cleanup branch. Both branches fixed #286 in parallel with byte-identical push-ACK CRC logic. In the six overlapping files the maintainer's implementation is kept (ACL replay-detection/session helpers, encoded path-len with legacy fallback, expected_crc/ack_timeout_s injector API, dispatcher ACK helpers); this branch's unique companion work is preserved on top (sender_prefix persistence + migration, boot-state hardening / CompanionStateLoadError, MessageQueue.max_size, older-core fallbacks). Conflict resolution took the maintainer's side across the overlap, then fixed two integration seams the merge introduced and updated this branch's tests to the maintainer's API: - room_server: timeout used undefined `hops`; aligned to `path_len`. - packet_router: PATH helper was invoked twice (maintainer's unconditional call plus this branch's conditional local-identity call); dropped the now-redundant conditional block. Pin openhop_core to @dev (was @feature/publish-workflow-message-handling) so this can merge to the repeater's dev; core dev carries the required sender_prefix and PathUtils.is_valid_path_len APIs. Full suite green (1040 passed) against openhop_core dev and refactor/companion-housekeeping; ruff clean.
This commit is contained in:
commit
954150b2d8
120 files changed
+1881
-350
No files matched your search
+2
-2
@@ -29,7 +29,7 @@ keywords = ["mesh", "networking", "lora", "repeater", "daemon", "iot"]
|
||||
|
||||
|
||||
dependencies = [
|
||||
"openhop_core[hardware]",
|
||||
"openhop_core[hardware] @ git+https://github.com/openhop-dev/openhop_core.git@dev",
|
||||
"pyyaml>=6.0.0",
|
||||
"cherrypy>=18.0.0",
|
||||
"paho-mqtt>=1.6.0",
|
||||
@@ -45,7 +45,7 @@ dependencies = [
|
||||
[project.optional-dependencies]
|
||||
# SX1262/SPI support (Linux only; required for Raspberry Pi HATs)
|
||||
hardware = [
|
||||
"openhop_core[hardware]",
|
||||
"openhop_core[hardware] @ git+https://github.com/openhop-dev/openhop_core.git@dev",
|
||||
]
|
||||
# RRD metrics (Performance Metrics chart); system librrd required (e.g. apt install rrdtool)
|
||||
rrd = [
|
||||
|
||||
Reference in new issue
Block a user