remoteRF-server 1.7.9__tar.gz → 1.7.11__tar.gz

{remoterf_server-1.7.9 → remoterf_server-1.7.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.7.9
+Version: 1.7.11
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.7.9 → remoterf_server-1.7.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "1.7.9"
+version = "1.7.11"
 description = "RemoteRF server-side control package"
 license = { text = "GPL-3.0-or-later" }
 requires-python = ">=3.10"

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

@@ -0,0 +1,6 @@
+
+"""Built-in Wi-Fi schema support."""
+
+from .wifi_schema import WifiSchema
+
+__all__ = ["WifiSchema"]

remoterf_server-1.7.9/src/remoteRF_server/drivers/wifi_dongle/wifi_dongle_schema.py → remoterf_server-1.7.11/src/remoteRF_server/drivers/wifi/wifi_schema.py

@@ -566,19 +566,18 @@ class WifiDongleDevice:
 # RemoteRF Device Schema Class
 # -----------------------------------------------------------------------------
 
-@idl_register("wifi_dongle")
-class WifiDongleSchema(DeviceSchema):
+@idl_register("wifi")
+class WifiSchema(DeviceSchema):
     """
     RemoteRF Device Schema for USB Wi-Fi Dongles (RSSI Collector & RF Monitor).
 
     Exposes live wireless telemetry, accurate linear-power RSSI statistics,
     batch burst sampling, and deep 802.11 physical layer diagnostics to remote Python clients.
     """
-    device_type = "wifi_dongle"
+    device_type = "wifi"
     client_class = "WifiDongle"
     driver_version = "0.1.0"
 
-    client_modules = {"wifi_dongle": "remoteRF.drivers.support.wifi_dongle"}
 
     @staticmethod
     def make_device(**kwargs) -> Optional[WifiDongleDevice]:
@@ -599,16 +598,16 @@ class WifiDongleSchema(DeviceSchema):
         max_history = int(kwargs.get("max_history", 100))
 
         try:
-            print(f"[wifi_dongle] Initializing USB Wi-Fi dongle (interface={interface or 'auto'})...")
+            print(f"[wifi] Initializing USB Wi-Fi dongle (interface={interface or 'auto'})...")
             dev = WifiDongleDevice(
                 interface=interface,
                 auto_rescan=auto_rescan,
                 max_history=max_history
             )
-            print(f"[wifi_dongle] Bound to interface '{dev.interface}'. Default route protected.")
+            print(f"[wifi] Bound to interface '{dev.interface}'. Default route protected.")
             return dev
         except Exception as exc:
-            print(f"[wifi_dongle] Failed to initialize device: {exc}")
+            print(f"[wifi] Failed to initialize device: {exc}")
             return None
 
     # -------------------------------------------------------------------------

{remoterf_server-1.7.9 → remoterf_server-1.7.11}/src/remoteRF_server/remote_admin_shell.py

@@ -56,7 +56,7 @@ TIERS = {
     "cluster create": WRITE, "cluster invite": WRITE, "cluster join": WRITE, "cluster kick": WRITE,
     "cluster cap": WRITE, "cluster peers": WRITE, "restart": WRITE, "reload devices": WRITE,
     "db export": WRITE, "cluster groups": WRITE, "cluster codes create": WRITE, "cluster accept": WRITE,
-    "schema download": WRITE,
+    "schema download": WRITE, "reservations cancel": WRITE,
     # write, interactive in the daemon: through the control socket's prompt bridge
     "users manage": WRITE, "diag": WRITE,
     # destructive: password again, a typed word, an automatic backup, then -y

{remoterf_server-1.7.9 → remoterf_server-1.7.11}/src/remoteRF_server/server/commands.py

@@ -126,6 +126,7 @@ def _table() -> list[Command]:
         Command(("users prune-proxies",), "Partner-deployment visitors whose home is gone: list them, -y removes [--stale DAYS]", _daemon("cmd_users_prune_proxies"), "Users", where=D),
         # ---- reservations ----
         Command(("reservations list",), "List reservations", _daemon("cmd_reservations_list"), "Reservations", where=D),
+        Command(("reservations cancel",), "Cancel one reservation: reservations cancel <res_id> [-y]", _daemon("cmd_reservations_cancel"), "Reservations", where=D),
         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"),
@@ -361,7 +362,12 @@ def _run_in_daemon(command: Command, rest: list[str]) -> int:
         # for a remote admin: that would hand them the live console, past the policy.
         return console.run_in_console([*command.names[0].split(), *rest])
     # A prompt inside the daemon is asked here, over the socket (control.call).
-    reply = control.call([*command.names[0].split(), *rest], timeout=3600.0 if command.interactive else 30.0)
+    timeout = (
+        3600.0 if command.interactive
+        else 120.0 if command.names[0] == "reload devices"
+        else 30.0
+    )
+    reply = control.call([*command.names[0].split(), *rest], timeout=timeout)
     if reply is None:
         print("The server stopped answering.", file=sys.stderr)
         return 1

{remoterf_server-1.7.9 → remoterf_server-1.7.11}/src/remoteRF_server/server/device_manager.py

@@ -395,6 +395,10 @@ def _connect_from_record(rec: Dict[str, Any], *, connect: bool = True):
     # Keep those inventories usable while all new writes use the canonical type.
     if dtype == "pluto":
         dtype = "adalm_pluto"
+    # The built-in Wi-Fi driver's original public type was "wifi_dongle".
+    # Keep existing inventories usable while all new schemas use "wifi".
+    if dtype == "wifi_dongle":
+        dtype = "wifi"
     ident = (rec.get("IDENT") or "").strip()
     init_kwargs = rec.get("INIT") or {}
     if not connect:
@@ -493,6 +497,13 @@ def _packaged_driver_schema_path(filename: str) -> Path:
     for candidate in sorted(drivers_root.glob(f"*/{filename}")):
         if candidate.exists():
             return candidate
+    server_drivers_root = Path(__file__).resolve().parents[1] / "drivers"
+    direct = server_drivers_root / filename
+    if direct.exists():
+        return direct
+    for candidate in sorted(server_drivers_root.glob(f"*/{filename}")):
+        if candidate.exists():
+            return candidate
     return drivers_root / "adalm_pluto" / filename
 
 def _driver_registers_type(path: Path, device_type: str) -> bool:
@@ -555,6 +566,27 @@ def _refresh_managed_driver(
     return True
 
 
+def _remove_managed_driver(target: Path) -> bool:
+    """Remove a schema only when its managed marker still matches its contents."""
+    marker = _managed_driver_marker(target)
+    if not target.is_file() or not marker.is_file():
+        return False
+    try:
+        marker_hash = marker.read_text(encoding="utf-8").strip()
+        target_hash = _driver_sha256(target)
+        normalized_hash = _driver_normalized_sha256(target)
+    except OSError:
+        return False
+    if marker_hash not in (target_hash, normalized_hash):
+        return False
+    try:
+        target.unlink()
+        marker.unlink()
+    except OSError:
+        return False
+    return True
+
+
 def _seed_default_driver(
     filename: str,
     *device_types: str,
@@ -655,6 +687,14 @@ def _seed_default_usrp_phaser_driver() -> None:
     _seed_default_driver("usrp_phaser_schema.py", "usrp_phaser")
 
 
+def _seed_default_wifi_driver() -> None:
+    drivers_dir = get_drivers_dir()
+    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")
+
+
 # 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)"
@@ -667,6 +707,7 @@ def _load_all_drivers() -> None:
     _seed_default_hackrf_driver()
     _seed_default_ti_mmwave_driver()
     _seed_default_usrp_phaser_driver()
+    _seed_default_wifi_driver()
 
     # The Pluto drivers need the native libiio behind pylibiio; without it
     # every one of them fails the same way, which is worth one line, not four.
@@ -690,6 +731,7 @@ def _load_all_drivers() -> None:
         ("built-in hackrf driver", "..drivers.hackrf.hackrf_schema"),
         ("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__)

{remoterf_server-1.7.9 → remoterf_server-1.7.11}/src/remoteRF_server/server/federation/cli.py

@@ -47,7 +47,27 @@ def _day(epoch) -> str:
     return datetime.datetime.fromtimestamp(int(epoch)).strftime("%Y-%m-%d")
 
 
-def cmd_clusters() -> int:
+def _cluster_json(item: dict) -> dict:
+    if item["role"] == "owner":
+        parties = item.get("members", [])
+    else:
+        parties = [{
+            "deployment_id": item["peer"],
+            "display_name": item.get("peer_name"),
+            "state": item.get("state"),
+        }, *item.get("peers", [])]
+    return {
+        "name": str(item["name"]),
+        "lab_cap": int(item["lab_cap"]) if item.get("lab_cap") else None,
+        "members": [{
+            "deployment_id": str(member["deployment_id"]),
+            "display_name": str(member.get("display_name") or member["deployment_id"]),
+            "state": str(member.get("state") or ""),
+        } for member in parties],
+    }
+
+
+def cmd_clusters(*, json_output: bool = False) -> int:
     from ...common.utils.panel import marker, print_panel
     from . import cluster
 
@@ -59,8 +79,13 @@ def cmd_clusters() -> int:
         print(f"Federation is not enabled: {exc}")
         return 1
     state = load_state(Path(config["identity_dir"]))
-    rows = [f"{marker()} {config['display_name']}", ""]
     items = cluster.list_clusters()
+    if json_output:
+        from ..json_output import print_json
+
+        print_json([_cluster_json(item) for item in items])
+        return 0
+    rows = [f"{marker()} {config['display_name']}", ""]
     if not items:
         rows.append("No clusters. Start one with `cluster create <name>`.")
     me = {"display_name": config["display_name"], "deployment_id": state.deployment_id}
@@ -108,11 +133,8 @@ def cmd_clusters() -> int:
     return 0
 
 
-def cmd_cluster_info(name: str) -> int:
+def cmd_cluster_info(name: str, *, json_output: bool = False) -> int:
     """Every lab in the cluster, each shared group with its limits, each device."""
-    from ...common.utils.panel import print_panel
-    from ..device_manager import describe_devices
-    from ..user_group_cli import _fmt_duration
     from . import cluster
 
     config = load_config()
@@ -120,6 +142,15 @@ def cmd_cluster_info(name: str) -> int:
     item = {i["name"]: i for i in cluster.list_clusters()}.get(name)
     if item is None:
         raise cluster.ClusterError(f"no cluster named {name}")
+    if json_output:
+        from ..json_output import print_json
+
+        print_json(_cluster_json(item))
+        return 0
+    from ...common.utils.panel import print_panel
+    from ..device_manager import describe_devices
+    from ..user_group_cli import _fmt_duration
+
     me = {"display_name": config["display_name"], "deployment_id": state.deployment_id}
     mine = {"groups": len(item["groups"]), "detail": [
         {"name": g["group_name"], "max_reservation_time_sec": g["max_reservation_time_sec"],
@@ -139,7 +170,8 @@ def cmd_cluster_info(name: str) -> int:
     for index, (lab, role, sharing) in enumerate(labs):
         if index:
             rows.append("")
-        rows.append(f"{_lab(lab)}  {role}" + ("  (you)" if lab["deployment_id"] == me["deployment_id"] else ""))
+        rows.append(f"{_lab(lab)}  {role}  {lab['deployment_id']}"
+                    + ("  (you)" if lab["deployment_id"] == me["deployment_id"] else ""))
         if not sharing.get("detail"):
             rows.append("    shares nothing")
         for group in sharing["detail"]:
@@ -310,7 +342,7 @@ def cmd_cluster(argv: list[str]) -> int:
     flags = [a for a in argv[1:] if a.startswith("--")]
     words = [a for a in argv[1:] if not a.startswith("--")]
     if verb == "list" and not words:
-        return cmd_clusters()
+        return cmd_clusters(json_output="--json" in flags)
     if verb == "codes" and (not words or words[0] not in ("create", "list")):
         print("Usage: cluster codes create [<cluster>] | cluster codes list [<cluster>]", file=sys.stderr)
         return 2
@@ -370,7 +402,7 @@ def cmd_cluster(argv: list[str]) -> int:
                    + (_n(int(answer), "reservation") if int(answer) else "any number of reservations")
                    + " on your devices at a time.", Sty.GRAY)
         elif verb == "info" and arg:
-            return cmd_cluster_info(arg)
+            return cmd_cluster_info(arg, json_output="--json" in flags)
         elif verb == "groups" and len(words) == 1:
             cluster._find(cluster.load(), arg)
             return _share_groups(arg)

{remoterf_server-1.7.9 → remoterf_server-1.7.11}/src/remoteRF_server/server/global_onboarding.py

@@ -1169,7 +1169,18 @@ _STATE_SUMMARY = {
 }
 
 
-def cmd_status(refresh: bool = True) -> int:
+def cmd_status(refresh: bool = True, *, json_output: bool = False) -> int:
+    if json_output:
+        from .json_output import print_json
+
+        kv = load()
+        print_json({
+            "state": str(kv.get("GLOBAL_STATE") or ("unregistered" if kv else "unconfigured")),
+            "slug": kv.get("GLOBAL_FINAL_NAME") or kv.get("GLOBAL_NAME") or None,
+            "deployment_id": kv.get("GLOBAL_DEPLOYMENT_ID") or None,
+            "relay": kv.get("GLOBAL_RELAY_HOSTNAME") or None,
+        })
+        return 0
     from ..common.utils.panel import marker, print_panel
 
     kv = load()
@@ -1310,6 +1321,8 @@ _COMMANDS = {"status": cmd_status, "join": cmd_join, "leave": cmd_leave}
 
 
 def main(argv) -> int:
+    if argv == ["status", "--json"]:
+        return cmd_status(json_output=True)
     if argv and argv[0] == "verify":
         # A code pasted from email may arrive wrapped across lines.
         return cmd_verify("".join(argv[1:]))

{remoterf_server-1.7.9 → remoterf_server-1.7.11}/src/remoteRF_server/server/grpc_server.py

@@ -54,7 +54,8 @@ from .dynamic_v2 import (
 from .host_dynamic_v2 import host_session_proxy
 from .acc_perms import perms
 from ..common.utils import *
-from .device_manager import close_local_devices, reload_devices, get_registered_devices, get_all_devices_str, handle_report
+from .device_manager import (close_local_devices, reload_devices, get_registered_devices,
+                             get_all_devices_str, handle_report, device_inventory_snapshot)
 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
@@ -681,7 +682,33 @@ def set_acc():
     elif inpu == 'c':
         print("Canceled. Exiting ...")
 
-def get_devices():
+def _devices_json() -> list[dict]:
+    from .json_output import epoch_ms_iso
+
+    reg = hts.get_tunnel_registry(create=False)
+    live = reg.list_devices() if reg is not None else {}
+    rows = []
+    for device_id, item in sorted(device_inventory_snapshot().items()):
+        ds = live.get(str(device_id))
+        rows.append({
+            "device_id": int(device_id),
+            "name": str(item["name"]),
+            "handle": str(item["handle"]),
+            "type": str(item["device_type"] or ""),
+            "host": f"{ds.host_id} #{ds.host_local_id}" if ds else "local",
+            "online": bool(item["online"]),
+            "state": None,
+            "last_seen": epoch_ms_iso(ds.last_seen_ms) if ds else None,
+        })
+    return rows
+
+
+def get_devices(*, json_output: bool = False):
+    if json_output:
+        from .json_output import print_json
+
+        print_json(_devices_json())
+        return
     from ..common.utils.panel import print_table
 
     reg = hts.get_tunnel_registry(create=False)
@@ -711,7 +738,33 @@ def _fmt_ms_ago(ms: int) -> str:
         return f"{dt/1000:.1f}s"
     return f"{dt/60_000:.1f}m"
 
-def _cmd_hosts_status() -> None:
+def _hosts_json() -> list[dict]:
+    from .json_output import epoch_ms_iso
+
+    reg = hts.get_tunnel_registry()
+    assert reg is not None
+    hosts = reg.list_hosts()
+    by_host: dict[str, list[int]] = {}
+    for key, ds in reg.list_devices().items():
+        try:
+            device_id = int(key)
+        except (TypeError, ValueError):
+            continue
+        by_host.setdefault(ds.host_id or "-", []).append(device_id)
+    return [{
+        "host_id": str(host_id),
+        "online": bool(status.online),
+        "last_seen": epoch_ms_iso(status.last_seen_ms),
+        "devices": sorted(by_host.get(host_id, [])),
+    } for host_id, status in sorted(hosts.items())]
+
+
+def _cmd_hosts_status(*, json_output: bool = False) -> None:
+    if json_output:
+        from .json_output import print_json
+
+        print_json(_hosts_json())
+        return
     from ..common.utils.panel import print_table
 
     reg = hts.get_tunnel_registry()
@@ -1139,7 +1192,32 @@ def _cmd_detach() -> None:
         printf("Not in the console; the server runs in this terminal. Use quit to stop it.", Sty.GRAY)
 
 
-def _cmd_status() -> None:
+def _status_json() -> dict:
+    from . import global_onboarding as g
+
+    devices = device_inventory_snapshot()
+    now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    active = g._count(
+        reservation_handler.filepath,
+        "SELECT COUNT(*) FROM Reservations WHERE start_time <= ? AND end_time > ?",
+        (now, now),
+    )
+    return {
+        "server_version": g.server_version(),
+        "online": True,
+        "uptime_s": max(0, int((datetime.now() - start_time).total_seconds())),
+        "devices_total": len(devices),
+        "devices_online": sum(bool(item["online"]) for item in devices.values()),
+        "reservations_active": int(active),
+    }
+
+
+def _cmd_status(*, json_output: bool = False) -> None:
+    if json_output:
+        from .json_output import print_json
+
+        print_json(_status_json())
+        return
     from ..common.utils.panel import marker, print_panel
     from . import global_onboarding as g
 
@@ -1278,16 +1356,43 @@ def _reexec() -> None:
 
 
 # The shared command table calls these by name (commands.py).
-def cmd_status(argv): _cmd_status()
+def cmd_status(argv): _cmd_status(json_output="--json" in argv)
 def cmd_detach(argv): _cmd_detach()
 def cmd_clear(argv): clear()
-def cmd_hosts_status(argv): _cmd_hosts_status()
+def cmd_hosts_status(argv): _cmd_hosts_status(json_output="--json" in argv)
 def cmd_hosts_wipe(argv): _cmd_hosts_wipe(yes=("-y" in argv or "--yes" in argv))
 def cmd_users_list(argv): reservation_handler.print_all_accounts()
 def cmd_users_manage(argv): set_acc()
 def cmd_users_perms(argv): perms.print_perms()
 def cmd_users_purge(argv): reservation_handler.remove_all_users()
-def cmd_reservations_list(argv): reservation_handler.print_all_reservations()
+def cmd_reservations_list(argv): reservation_handler.print_all_reservations(json_output="--json" in argv)
+
+
+def cmd_reservations_cancel(argv):
+    args = [arg for arg in argv if arg not in ("-y", "--yes")]
+    if len(args) != 1 or any(arg.startswith("-") for arg in args):
+        print("Usage: reservations cancel <res_id> [-y]")
+        return 2
+    try:
+        res_id = int(args[0])
+        if not 0 < res_id < 2**63 or str(res_id) != args[0]:
+            raise ValueError
+    except ValueError:
+        print("Reservation ID must be a positive integer.")
+        return 2
+    row = reservation_handler.cancel_reservation_admin(res_id)
+    if row is None:
+        print(f"Reservation {res_id} was not found or has already ended.")
+        return 1
+    if row is False:
+        print(f"Reservation {res_id} is on a partner lab; the user cancels it from their client.")
+        return 3
+    print(" ".join(str(value) for value in row))
+    try:
+        reservation_handler.update_devices()
+    except Exception as exc:  # noqa: BLE001 - the delete is committed; report the pending release
+        print(f"Warning: device release pending ({exc}); it completes on the next device update.")
+    return 0
 
 
 def cmd_users_prune_proxies(argv):
@@ -1353,7 +1458,7 @@ def cmd_stats_purge(argv):
             printf("No activity log to purge.", Sty.GRAY)
             return
     printf(f"Purged activity log: {reservation.LOG_PATH}", Sty.GRAY)
-def cmd_devices_list(argv): get_devices()
+def cmd_devices_list(argv): get_devices(json_output="--json" in argv)
 
 
 def cmd_diag(argv):

remoterf_server-1.7.11/src/remoteRF_server/server/json_output.py

@@ -0,0 +1,30 @@
+# 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.
+
+"""Small, shared pieces of the machine-readable serverrf output."""
+
+from __future__ import annotations
+
+import json
+from datetime import datetime
+
+
+def print_json(value) -> None:
+    print(json.dumps(value, separators=(",", ":")))
+
+
+def local_iso(value) -> str:
+    """Render a stored local datetime with the server's UTC offset."""
+    parsed = value if isinstance(value, datetime) else datetime.fromisoformat(str(value).strip())
+    return parsed.astimezone().isoformat()
+
+
+def epoch_ms_iso(value) -> str | None:
+    milliseconds = int(value or 0)
+    if milliseconds <= 0:
+        return None
+    return datetime.fromtimestamp(milliseconds / 1000).astimezone().isoformat()

{remoterf_server-1.7.9 → remoterf_server-1.7.11}/src/remoteRF_server/server/reservation.py

@@ -802,6 +802,26 @@ class ReservationHandler:
     def remove_reservation(self, *, res_id):
        self.cursor.execute('DELETE FROM Reservations WHERE res_id = ?', (res_id,))
        return {"UC": map_arg(f'Removed reservation {res_id}')}
+
+    @db_connection
+    def cancel_reservation_admin(self, res_id: int):
+        row = self.cursor.execute(
+            "SELECT res_id, username, device_id, start_time, end_time "
+            "FROM Reservations WHERE res_id = ?",
+            (int(res_id),),
+        ).fetchone()
+        if row is None or _parse_reservation_datetime(row[4]) <= datetime.now():
+            return None
+        # A booking our user holds on a partner lab is cancelled there first (home_devices.cancel).
+        if self.cursor.execute(
+            "SELECT 1 FROM sqlite_master WHERE type='table' AND name='HomeFederatedReservations'"
+        ).fetchone() and self.cursor.execute(
+            "SELECT 1 FROM HomeFederatedReservations WHERE res_id = ?", (int(res_id),)
+        ).fetchone():
+            return False
+        self.cursor.execute("DELETE FROM Reservations WHERE res_id = ?", (int(res_id),))
+        self.cursor.execute("DELETE FROM FederatedReservations WHERE res_id = ?", (int(res_id),))
+        return row
     
     @db_connection 
     def rm_db(self):
@@ -1336,7 +1356,25 @@ class ReservationHandler:
         return [(_parse_reservation_datetime(a), _parse_reservation_datetime(b)) for a, b in rows]
 
     @db_connection 
-    def print_all_reservations(self):
+    def print_all_reservations(self, *, json_output: bool = False):
+        if json_output:
+            from .json_output import local_iso, print_json
+
+            rows = self.cursor.execute(
+                "SELECT r.res_id, r.username, r.device_id, r.start_time, r.end_time, "
+                "f.issuer_deployment_id FROM Reservations r LEFT JOIN FederatedReservations f "
+                "ON f.res_id=r.res_id ORDER BY r.res_id"
+            ).fetchall()
+            print_json([{
+                "res_id": int(res_id),
+                "username": str(username),
+                "device_id": int(device_id),
+                "start_time": local_iso(start),
+                "end_time": local_iso(end),
+                "federated": issuer is not None,
+                "issuer_deployment_id": str(issuer) if issuer is not None else None,
+            } for res_id, username, device_id, start, end, issuer in rows])
+            return
         from ..common.utils.panel import print_table
 
         cursor = self.db.cursor()

{remoterf_server-1.7.9 → remoterf_server-1.7.11}/src/remoteRF_server/serverrf_cli.py

@@ -28,6 +28,7 @@ from datetime import datetime, timezone
 import base64
 import secrets
 import hashlib
+import json
 import getpass
 import yaml
 
@@ -1485,11 +1486,14 @@ def _device_remove(global_id_str: str) -> int:
     return 0
 
 
-def _device_show() -> int:
+def _device_show(*, json_output: bool = False) -> int:
     from remoteRF_server.common.utils.panel import print_table
 
     p = _devices_yaml_path()
     if not p.exists() and not _devices_env_path().exists():
+        if json_output:
+            print("[]")
+            return 0
         print(f"No devices configured (missing {p}).")
         return 0
 
@@ -1508,6 +1512,18 @@ def _device_show() -> int:
         if is_device_handle(h):
             handles[gid] = h if h not in seen else f"{h} ignored (duplicate name)"
             seen.add(h)
+    if json_output:
+        print(json.dumps([{
+            "device_id": int(gid),
+            "name": str(record.get("NAME", "")),
+            "handle": str(handles.get(gid, "")),
+            "type": str(record.get("TYPE", "")),
+            "host": "local",
+            "online": False,
+            "state": None,
+            "last_seen": None,
+        } for gid, record in sorted(recs.items())], separators=(",", ":")))
+        return 0
     rows = [
         {"id": gid, "type": r.get("TYPE", ""), "name": r.get("NAME", ""),
          "handle": handles.get(gid, "-"),
@@ -1641,13 +1657,13 @@ def cmd_devices_list(argv: List[str]) -> int:
     if commands._IN_DAEMON:
         from remoteRF_server.server.grpc_server import get_devices
 
-        get_devices()
+        get_devices(json_output="--json" in argv)
         return 0
-    reply = control.call(["devices", "list"])
+    reply = control.call(["devices", "list", *(["--json"] if "--json" in argv else [])])
     if reply is not None:
         sys.stdout.write(reply[1])
         return reply[0]
-    return _device_show()
+    return _device_show(json_output="--json" in argv)
 
 
 # -----------------------------
@@ -2424,7 +2440,7 @@ def cmd_global(argv: List[str]) -> int:
     from remoteRF_server.server.global_onboarding import main as global_main
 
     rc = global_main(list(argv))
-    if rc == 0:
+    if rc == 0 and "--json" not in argv:
         _ensure_certificate_names()
     return rc
 

{remoterf_server-1.7.9 → remoterf_server-1.7.11}/src/remoteRF_server/tools/__init__.py

@@ -14,6 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+"""RRRFcerts: generate a local CA and a server TLS certificate/key with SANs.
+
+Output goes to ~/.config/remoterf/certs by default. Clients should trust ca.crt (not server.crt) and must dial an address that matches one of the SANs.
+"""
+
 from __future__ import annotations
 
 import argparse

{remoterf_server-1.7.9 → remoterf_server-1.7.11}/src/remoteRF_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.7.9
+Version: 1.7.11
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3