remoteRF-server 1.7.16__tar.gz → 1.7.18__tar.gz

{remoterf_server-1.7.16 → remoterf_server-1.7.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.7.16
+Version: 1.7.18
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3
@@ -10,7 +10,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: remoterf-federation-core==0.22.0
-Requires-Dist: remoterf-device-core==0.1.3
+Requires-Dist: remoterf-device-core==0.1.4
 Requires-Dist: grpcio<2.0.0,>=1.81.1
 Requires-Dist: protobuf<7.0.0,>=6.33.5
 Requires-Dist: numpy
@@ -29,6 +29,20 @@ Requires-Dist: cryptography<44,>=42
 Requires-Dist: aioice<0.11,>=0.10
 Requires-Dist: aioquic<2.0,>=1.2
 Requires-Dist: paramiko<6,>=3.4
+Provides-Extra: bluetooth
+Requires-Dist: remoterf-device-core[bluetooth]; extra == "bluetooth"
+Provides-Extra: gps
+Requires-Dist: remoterf-device-core[gps]; extra == "gps"
+Provides-Extra: krakensdr
+Requires-Dist: remoterf-device-core[krakensdr]; extra == "krakensdr"
+Provides-Extra: rfbeam-kmd7
+Requires-Dist: remoterf-device-core[rfbeam_kmd7]; extra == "rfbeam-kmd7"
+Provides-Extra: ti-awr6843
+Requires-Dist: remoterf-device-core[ti_awr6843]; extra == "ti-awr6843"
+Provides-Extra: wifi
+Requires-Dist: remoterf-device-core[wifi]; extra == "wifi"
+Provides-Extra: drivers
+Requires-Dist: remoterf-device-core[drivers]; extra == "drivers"
 Dynamic: license-file
 
 # Remote RF Server Guide (Linux)

{remoterf_server-1.7.16 → remoterf_server-1.7.18}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "1.7.16"
+version = "1.7.18"
 description = "RemoteRF server-side control package"
 license = { text = "GPL-3.0-or-later" }
 requires-python = ">=3.10"
 dependencies = [
     "remoterf-federation-core==0.22.0",
-    "remoterf-device-core==0.1.3",
+    "remoterf-device-core==0.1.4",
   "grpcio>=1.81.1,<2.0.0",
   "protobuf>=6.33.5,<7.0.0",
   "numpy",
@@ -37,6 +37,16 @@ classifiers = [
   "Operating System :: OS Independent",
 ]
 
+[project.optional-dependencies]
+# Libraries for the built-in drivers that are not in the base install (see remoterf-device-core).
+bluetooth = ["remoterf-device-core[bluetooth]"]
+gps = ["remoterf-device-core[gps]"]
+krakensdr = ["remoterf-device-core[krakensdr]"]
+rfbeam_kmd7 = ["remoterf-device-core[rfbeam_kmd7]"]
+ti_awr6843 = ["remoterf-device-core[ti_awr6843]"]
+wifi = ["remoterf-device-core[wifi]"]
+drivers = ["remoterf-device-core[drivers]"]
+
 [project.scripts]
 # RRRFserver = "remoteRF_server.server.grpc_server:main"
 serverrf = "remoteRF_server.serverrf_cli:main"

remoterf_server-1.7.18/src/remoteRF_server/drivers/bluetooth/bluetooth_schema.py

@@ -0,0 +1,20 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+"""Lives in remoterf-device-core (remoterf_device_core.drivers.bluetooth.bluetooth_schema); this name stays importable."""
+import importlib
+import sys
+
+sys.modules[__name__] = importlib.import_module("remoterf_device_core.drivers.bluetooth.bluetooth_schema")

remoterf_server-1.7.18/src/remoteRF_server/drivers/gps/gps_schema.py

@@ -0,0 +1,20 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+"""Lives in remoterf-device-core (remoterf_device_core.drivers.gps.gps_schema); this name stays importable."""
+import importlib
+import sys
+
+sys.modules[__name__] = importlib.import_module("remoterf_device_core.drivers.gps.gps_schema")

remoterf_server-1.7.18/src/remoteRF_server/drivers/krakensdr/krakensdr_schema.py

@@ -0,0 +1,20 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+"""Lives in remoterf-device-core (remoterf_device_core.drivers.krakensdr.krakensdr_schema); this name stays importable."""
+import importlib
+import sys
+
+sys.modules[__name__] = importlib.import_module("remoterf_device_core.drivers.krakensdr.krakensdr_schema")

remoterf_server-1.7.18/src/remoteRF_server/drivers/rfbeam_kmd7/rfbeam_kmd7_schema.py

@@ -0,0 +1,20 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+"""Lives in remoterf-device-core (remoterf_device_core.drivers.rfbeam_kmd7.rfbeam_kmd7_schema); this name stays importable."""
+import importlib
+import sys
+
+sys.modules[__name__] = importlib.import_module("remoterf_device_core.drivers.rfbeam_kmd7.rfbeam_kmd7_schema")

remoterf_server-1.7.18/src/remoteRF_server/drivers/ti_awr6843/__init__.py

@@ -0,0 +1,14 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

remoterf_server-1.7.18/src/remoteRF_server/drivers/ti_awr6843/ti_awr6843_schema.py

@@ -0,0 +1,20 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+"""Lives in remoterf-device-core (remoterf_device_core.drivers.ti_awr6843.ti_awr6843_schema); this name stays importable."""
+import importlib
+import sys
+
+sys.modules[__name__] = importlib.import_module("remoterf_device_core.drivers.ti_awr6843.ti_awr6843_schema")

remoterf_server-1.7.18/src/remoteRF_server/drivers/usrp/__init__.py

@@ -0,0 +1,14 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

remoterf_server-1.7.18/src/remoteRF_server/drivers/usrp_phaser/__init__.py

@@ -0,0 +1,14 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

remoterf_server-1.7.18/src/remoteRF_server/drivers/wifi/__init__.py

@@ -0,0 +1,14 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

remoterf_server-1.7.18/src/remoteRF_server/drivers/wifi/wifi_schema.py

@@ -0,0 +1,20 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+"""Lives in remoterf-device-core (remoterf_device_core.drivers.wifi.wifi_schema); this name stays importable."""
+import importlib
+import sys
+
+sys.modules[__name__] = importlib.import_module("remoterf_device_core.drivers.wifi.wifi_schema")

remoterf_server-1.7.18/src/remoteRF_server/host/__init__.py

@@ -0,0 +1,14 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

remoterf_server-1.7.18/src/remoteRF_server/server/__init__.py

@@ -0,0 +1,14 @@
+# Copyright (C) 2026 RemoteRF
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

{remoterf_server-1.7.16 → remoterf_server-1.7.18}/src/remoteRF_server/server/commands.py

@@ -130,7 +130,7 @@ def _table() -> list[Command]:
         Command(("reservations purge",), "Remove ALL reservations", _daemon("cmd_reservations_purge"), "Reservations", where=D),
         # ---- groups ----
         Command(("groups list",), "List user groups", _shell("cmd_groups_list"), "Groups"),
-        Command(("groups create",), "Create a user group (interactive)", _shell("cmd_groups_create"), "Groups"),
+        Command(("groups create",), "Create a group: groups create <name> --devices <ids> [--max-reservations 3 --max-time 1800 --horizon 604800 --lifetime 0 --lan-only --public --share <clusters>] --yes [--json]; no name is interactive", _shell("cmd_groups_create"), "Groups"),
         Command(("groups edit",), "Edit a user group (interactive)", _shell("cmd_groups_edit"), "Groups"),
         Command(("groups remove",), "Delete a user group (interactive)", _shell("cmd_groups_remove"), "Groups"),
         Command(("groups public",), "Share a group with anyone on RemoteRF Global, or stop: groups public <group> on|off", _federation("public"), "Groups"),
@@ -138,7 +138,7 @@ def _table() -> list[Command]:
         Command(("groups csv",), "Export ALL user groups as CSV to Downloads", _shell("cmd_groups_csv"), "Groups"),
         # ---- enrollment codes ----
         Command(("codes list",), "List enrollment codes", _shell("cmd_codes_list"), "Enrollment codes"),
-        Command(("codes create",), "Create enrollment codes for a group or a cluster (interactive)", _shell("cmd_codes_create"), "Enrollment codes"),
+        Command(("codes create",), "Create codes: codes create <group name|id|none> --count N [--length 10 --uses 1 --duration 3600] --yes [--json]; no group is interactive", _shell("cmd_codes_create"), "Enrollment codes"),
         Command(("codes remove",), "Delete an enrollment code (interactive)", _shell("cmd_codes_remove"), "Enrollment codes"),
         Command(("codes csv",), "Export ALL enrollment codes as CSV to Downloads", _shell("cmd_codes_csv"), "Enrollment codes"),
         # ---- hosts ----

{remoterf_server-1.7.16 → remoterf_server-1.7.18}/src/remoteRF_server/server/device_manager.py

@@ -18,6 +18,7 @@
 from __future__ import annotations
 
 import importlib
+import importlib.util
 import inspect
 import logging
 import os
@@ -36,8 +37,8 @@ from contextlib import contextmanager
 from remoterf_federation_core import is_device_handle
 
 from ..common.utils import validate_token, get_remoterf_root, get_drivers_dir, device_name_key
-from ..common.idl.schema import (OVERRIDE_PREFIX, get_driver_class, last_load_results, load_drivers,
-                                 override_stale)
+from ..common.idl.schema import (OVERRIDE_PREFIX, get_driver_class, last_load_results, load_builtin_drivers,
+                                 load_drivers, override_stale)
 from ..host import host_tunnel_server as hts
 
 logger = logging.getLogger(__name__)
@@ -694,12 +695,14 @@ def _seed_default_wifi_driver() -> None:
     legacy = drivers_dir / "wifi_dongle_schema.py"
     if not _remove_managed_driver(legacy) and legacy.is_file():
         print(f"[drivers] Kept {legacy}: not a managed copy. Remove it, or two Wi-Fi drivers register.")
-    _seed_default_driver("wifi_schema.py", "wifi")
+    # No wifi_schema.py copy any more: the built-in serves natively, and an existing copy (managed
+    # or not) is left exactly as it is, so it keeps winning over the built-in.
 
 
 # Only the C library from conda: pip already installed pyadi-iio, and conda's
 # pulls a cryptography that breaks the pip-installed pyOpenSSL aioquic needs.
 _LIBIIO_FIX = "conda install -c conda-forge libiio  (in the server's conda env; not pyadi-iio, pip already has it)"
+_OPTIONAL_NATIVE_TYPES = frozenset({"bluetooth", "gps", "krakensdr", "rfbeam_kmd7", "ti_awr6843"})
 
 
 def _load_all_drivers() -> None:
@@ -725,7 +728,8 @@ def _load_all_drivers() -> None:
             return
         print(line)
 
-    for label, module in (
+    # Built-ins first, the drivers dir after: a file there of the same type registers last and wins.
+    builtins = {importlib.util.resolve_name(module, __package__): label for label, module in (
         ("built-in pluto driver", "..common.idl.pluto_schema"),
         ("built-in pluto mimo driver", "..common.idl.pluto_mimo_schema"),
         ("built-in usrp driver", "..drivers.usrp.usrp_schema"),
@@ -734,11 +738,25 @@ def _load_all_drivers() -> None:
         ("built-in TI mmWave driver", "..drivers.ti_mmwave.ti_mmwave_schema"),
         ("built-in USRP Phaser driver", "..drivers.usrp_phaser.usrp_phaser_schema"),
         ("built-in Wi-Fi driver", "..drivers.wifi.wifi_schema"),
-    ):
-        try:
-            importlib.import_module(module, __package__)
-        except Exception as e:
-            _warn(f"Warning: could not load {label}: {e}", str(e))
+        ("built-in Bluetooth driver", "..drivers.bluetooth.bluetooth_schema"),
+        ("built-in GPS driver", "..drivers.gps.gps_schema"),
+        ("built-in KrakenSDR driver", "..drivers.krakensdr.krakensdr_schema"),
+        ("built-in RFbeam K-MD7 driver", "..drivers.rfbeam_kmd7.rfbeam_kmd7_schema"),
+        ("built-in TI AWR6843 driver", "..drivers.ti_awr6843.ti_awr6843_schema"),
+    )}
+    configured = None
+    for module, status in load_builtin_drivers(builtins).items():
+        if status == "ok":
+            continue
+        dtype = module.rsplit(".", 1)[1].removesuffix("_schema")
+        if dtype in _OPTIONAL_NATIVE_TYPES:
+            # Their libraries are optional extras: a line only when devices.yml has one (`schema served` lists all).
+            if configured is None:
+                configured = {(r.get("TYPE") or "").strip().lower() for r in _load_device_records().values()}
+            if dtype not in configured:
+                continue
+        error = status.removeprefix("error: ")
+        _warn(f"Warning: could not load {builtins[module]}: {error}", error)
 
     for fname, status in load_drivers().items():
         if status != "ok":

{remoterf_server-1.7.16 → remoterf_server-1.7.18}/src/remoteRF_server/server/direct_path.py

@@ -61,6 +61,7 @@ from remoterf_device_core.direct import (
     peer_address, quiet_aioice_errors, read_frame, stun_server,
 )
 from .global_onboarding import RELAYED, hostname, is_offsite
+from .transport_counters import transport_counters
 
 logger = logging.getLogger("remoteRF_server.direct")
 
@@ -247,13 +248,18 @@ class _Path:
 async def _serve_call(path, reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:
     """One stream = one device call, on an ICE path or a fixed-port connection."""
     bad_frame = refused = None
+    request = None
+    request_frame = response_frame = b""
     try:
         try:
             request = grpc_pb2.GenericRPCRequest()
-            request.ParseFromString(await read_frame(reader))
+            request_frame = await read_frame(reader)
+            request.ParseFromString(request_frame)
         except asyncio.IncompleteReadError:
+            request = None
             return  # the client went away mid-frame
         except Exception as exc:  # noqa: BLE001 - not our framing: say so, then drop the path
+            request = None
             bad_frame = f"bad frame: {type(exc).__name__}: {exc}"
             results = {"a": map_arg(bad_frame)}
         else:
@@ -264,12 +270,17 @@ async def _serve_call(path, reader: asyncio.StreamReader, writer: asyncio.Stream
             except PathRefused as exc:
                 refused = str(exc)
                 results = {"a": map_arg(refused)}
-        writer.write(frame(grpc_pb2.GenericRPCResponse(results=results).SerializeToString()))
+        response_frame = grpc_pb2.GenericRPCResponse(results=results).SerializeToString()
+        writer.write(frame(response_frame))
         writer.write_eof()
         path.calls += 1
     except Exception as exc:  # noqa: BLE001 - one lost stream must not take the path down
         logger.debug("direct path stream: %s", exc)
     finally:
+        if request is not None:
+            transport_counters.record(
+                "direct", request.function_name, len(request_frame), len(response_frame)
+            )
         # Ends our side of the stream on every path; Python < 3.12 does not
         # close an abandoned StreamWriter, and the half-open stream lingers.
         writer.close()

{remoterf_server-1.7.16 → remoterf_server-1.7.18}/src/remoteRF_server/server/global_onboarding.py

@@ -66,7 +66,8 @@ and your LAN address. For the devices you share on Global it also sends how
 many reservations start in each hour of the day and on each day of the week
 (UTC), the reservations and time reserved per device type, and for each
 device shared on Global its name and its daily reservation counts and time
-reserved over the last 31 days (counts only).
+reserved over the last 31 days. It also sends daily per-path, per-device-type,
+per-function device call and byte counts (counts only, no users).
 Nothing else leaves your server -- no credentials, no user or reservation
 details -- and the connection only goes outward. Global publishes the network
 totals, these breakdowns, and each deployment's name, version, devices, when
@@ -815,6 +816,7 @@ STATUS_FIELDS = frozenset(
         "reservations",
         "reserved_s",
         "usage",
+        "transport",
         "lan_address",
         "cert_sha256",
     }
@@ -969,6 +971,44 @@ def usage_summary() -> dict:
     return usage
 
 
+def transport_summary() -> dict:
+    """Daily device RPC calls and application bytes, without user or device identity."""
+    from datetime import datetime, timedelta, timezone
+
+    from .transport_counters import _FN_RE, _MAX_INTEGER, _PATHS, _TYPE_RE, transport_counters
+
+    transport_counters.flush()
+    today = datetime.now(timezone.utc).date()
+    days = []
+    for day, path, device_type, fn, calls, bytes_in, bytes_out in _rows(
+        _db_dir() / "reservations.db",
+        "SELECT day, path, type, fn, calls, bytes_in, bytes_out FROM TransportDays "
+        "WHERE day BETWEEN ? AND ? AND (calls > 0 OR bytes_in > 0 OR bytes_out > 0) "
+        "ORDER BY day DESC, path, type, fn LIMIT 500",
+        # Global keeps every day it was sent; only today and yesterday still change.
+        (str(today - timedelta(days=1)), str(today)),
+    ):
+        if (not re.fullmatch(r"\d{4}-\d{2}-\d{2}", str(day)) or path not in _PATHS
+                or not _TYPE_RE.fullmatch(str(device_type)) or not _FN_RE.fullmatch(str(fn))):
+            continue
+        try:
+            values = [min(max(int(value), 0), _MAX_INTEGER) for value in (calls, bytes_in, bytes_out)]
+        except (TypeError, ValueError):
+            continue
+        if not any(values):
+            continue
+        days.append({
+            "day": day,
+            "path": path,
+            "type": device_type,
+            "fn": fn,
+            "calls": values[0],
+            "bytes_in": values[1],
+            "bytes_out": values[2],
+        })
+    return {"days": days}
+
+
 def cert_sha256() -> Optional[str]:
     import hashlib
 
@@ -1000,6 +1040,7 @@ def status_payload() -> dict:
         "reservations": _count(reservations, "SELECT n FROM ReservationCount"),
         "reserved_s": _count(reservations, "SELECT CAST(ROUND(seconds) AS INTEGER) FROM ReservedTotal"),
         "usage": usage_summary(),
+        "transport": transport_summary(),
         "lan_address": lan_endpoint(),
         "cert_sha256": cert_sha256(),
     }
@@ -1019,11 +1060,16 @@ def send_status() -> None:
 
     payload = status_payload()
     # A Global older than a field refuses the note: drop the newest first
-    # (`usage.by_device`, `usage`, then `reservations`), then
+    # (`transport`, `usage.by_device`, `usage`, then `reservations`), then
     # `proxies`/`reserved_s`, as the note was before each of them.
-    steps = [payload, dict(payload, usage={k: v for k, v in payload["usage"].items() if k != "by_device"})]
+    without_transport = {k: v for k, v in payload.items() if k != "transport"}
+    steps = [
+        payload,
+        without_transport,
+        dict(without_transport, usage={k: v for k, v in payload["usage"].items() if k != "by_device"}),
+    ]
     for drop in (("usage",), ("usage", "reservations"), ("usage", "reservations", "proxies", "reserved_s")):
-        steps.append({k: v for k, v in payload.items() if k not in drop})
+        steps.append({k: v for k, v in without_transport.items() if k not in drop})
     for status in steps:
         try:
             call("POST", REPORT_PATH, {"kind": "status", "status": status})

{remoterf_server-1.7.16 → remoterf_server-1.7.18}/src/remoteRF_server/server/grpc_server.py

@@ -60,6 +60,7 @@ from .device_manager import (close_local_devices, reload_devices, get_registered
 from .user_group_cli import make_user_group_local, edit_user_group_local, list_user_groups_local, remove_user_group_local, make_enrollment_codes_local, remove_enrollment_code_local, list_enrollment_codes_local, export_user_groups_csv_local, export_enrollment_codes_csv_local
 from .user_group_handler import start_usergroup_cleanup_loop
 from .global_onboarding import start_agent
+from .transport_counters import transport_counters
 
 from ..host import host_tunnel_server as hts
 from ..host.host_tunnel_server import HostTunnelServicer
@@ -190,14 +191,23 @@ class GenericRPCServicer(grpc_pb2_grpc.GenericRPCServicer):
         # LAN-only groups do not exist to a call that came through the relay.
         from .global_onboarding import CLIENT_VERSION, RELAYED, client_metadata_version, is_relayed
 
-        token = RELAYED.set(is_relayed(context.peer()))
+        relayed = is_relayed(context.peer())
+        token = RELAYED.set(relayed)
         version = CLIENT_VERSION.set(client_metadata_version(context.invocation_metadata()))
+        reply = None
         try:
             response = rpc_manager.run_rpc(function_name=request.function_name, args=request.args)
+            reply = grpc_pb2.GenericRPCResponse(results=response)
+            return reply
         finally:
             CLIENT_VERSION.reset(version)
             RELAYED.reset(token)
-        return grpc_pb2.GenericRPCResponse(results=response)
+            transport_counters.record_protobuf(
+                "relay" if relayed else "lan",
+                request.function_name,
+                request,
+                reply,
+            )
 
 
 @dataclass
@@ -231,6 +241,7 @@ class ServerRuntime:
         try:
             termination.wait(timeout=max(1.0, float(grace_sec) + 2.0))
         finally:
+            transport_counters.flush(force=True)
             if direct_path is not None:
                 direct_path.shutdown()
             session_manager.close_all()

{remoterf_server-1.7.16 → remoterf_server-1.7.18}/src/remoteRF_server/server/reservation.py

@@ -73,6 +73,7 @@ def _fanout(call, empty):
 _LAN_SECRET = re.compile(r"[0-9a-f]{64}")
 from .user_group_handler import user_group_handler
 from . import global_onboarding
+from .transport_counters import create_table as create_transport_days
 from .global_onboarding import CLIENT_VERSION, MIN_CLIENT_VERSION, RELAYED, client_is_current, lan_only_hint
 from .federation.migrations import (
     FEDERATED_PASSWORD_HASH,
@@ -310,6 +311,7 @@ class ReservationHandler:
         END;
         COMMIT;
         ''')
+        create_transport_days(self.db)
 
         # "Stay logged in" for the deployment protocol: a random token the
         # client keeps instead of the password. Only its hash lives here, so