mirror of
https://github.com/l5yth/potato-mesh.git
synced 2026-07-06 01:42:11 +02:00
l5y
1041e06644
* data: refactor 4/7 interfaces * data: address PR #775 review feedback Fix the two CI test regressions caused by the package split: - ``factory._load_ble_interface`` no longer keeps a stale module-level ``BLEInterface`` cache that survived ``monkeypatch`` teardown across tests. The package-level attribute is now the single cache; the ``factory.py`` global was removed. This unblocks ``test_load_ble_interface_sets_global``. - ``interfaces/__init__.py`` re-resolves ``SerialInterface`` and ``TCPInterface`` from ``meshtastic.*`` at package-load time so that a test that pops ``data.mesh_ingestor.interfaces`` from ``sys.modules`` and re-imports picks up the freshly registered classes rather than whatever a cached ``factory.py`` first resolved. This unblocks ``test_interfaces_patch_handles_preimported_serial``. Restore 100% patch coverage on the interfaces subpackage by: - Adding tests for previously uncovered, testable paths: ``_extract_host_node_id(None)``, ``_ensure_channel_metadata``, ``_normalise_nodeinfo_packet`` (None input + dict-conversion fallback), ``_resolve_lora_message`` (radio_section paths), ``_modem_preset`` (preset attr fallback + unparseable value), ``_camelcase_enum_name`` separator-only input, ``_region_frequency`` no-digit enum name, ``_ensure_radio_metadata`` unresolvable-message path, plus the unknown-section recursive branch of ``_candidate_node_id``. - Marking genuinely unreachable defensive branches with ``pragma: no cover`` (BLE receive loop body, upstream API regression guards, patch re-entry guard, unreachable ``NoAvailableMeshInterface`` fallback).
85 lines
2.7 KiB
Python
85 lines
2.7 KiB
Python
# Copyright © 2025-26 l5yth & contributors
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
"""Network target parsing helpers for Meshtastic interfaces."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import ipaddress
|
|
import urllib.parse
|
|
|
|
from ..connection import DEFAULT_TCP_PORT
|
|
|
|
_DEFAULT_TCP_TARGET = "http://127.0.0.1"
|
|
|
|
|
|
def _parse_network_target(value: str) -> tuple[str, int] | None:
|
|
"""Return ``(host, port)`` when ``value`` is a numeric IP address string.
|
|
|
|
Only literal IPv4 or IPv6 addresses are accepted, optionally paired with a
|
|
port or scheme. Callers that start from hostnames should resolve them to an
|
|
address before invoking this helper.
|
|
|
|
Parameters:
|
|
value: Numeric IP literal or URL describing the TCP interface.
|
|
|
|
Returns:
|
|
A ``(host, port)`` tuple or ``None`` when parsing fails.
|
|
"""
|
|
|
|
if not value:
|
|
return None
|
|
|
|
value = value.strip()
|
|
if not value:
|
|
return None
|
|
|
|
def _validated_result(host: str | None, port: int | None) -> tuple[str, int] | None:
|
|
if not host:
|
|
return None
|
|
try:
|
|
ipaddress.ip_address(host)
|
|
except ValueError:
|
|
return None
|
|
return host, port or DEFAULT_TCP_PORT
|
|
|
|
parsed_values = []
|
|
if "://" in value:
|
|
parsed_values.append(urllib.parse.urlparse(value, scheme="tcp"))
|
|
parsed_values.append(urllib.parse.urlparse(f"//{value}", scheme="tcp"))
|
|
|
|
for parsed in parsed_values:
|
|
try:
|
|
port = parsed.port
|
|
except ValueError:
|
|
port = None
|
|
result = _validated_result(parsed.hostname, port)
|
|
if result:
|
|
return result
|
|
|
|
# For bare "host:port" strings that urlparse may misparse, try a manual
|
|
# partition. The `startswith("[")` guard excludes IPv6 bracket notation
|
|
# (e.g. "[::1]:8080") because those already succeed via urlparse above.
|
|
if value.count(":") == 1 and not value.startswith("["):
|
|
host, _, port_text = value.partition(":")
|
|
try:
|
|
port = int(port_text) if port_text else None
|
|
except ValueError:
|
|
port = None
|
|
result = _validated_result(host, port)
|
|
if result: # pragma: no cover - urlparse handles all currently-known forms
|
|
return result
|
|
|
|
return _validated_result(value, None)
|