remoteRF-server 0.1.96__tar.gz → 0.1.97__tar.gz

{remoterf_server-0.1.96 → remoterf_server-0.1.97}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 0.1.96
+Version: 0.1.97
 Description-Content-Type: text/markdown
 Requires-Dist: grpcio
 Requires-Dist: protobuf

{remoterf_server-0.1.96 → remoterf_server-0.1.97}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server"
-version = "0.1.96"
+version = "0.1.97"
 dependencies = [
   "grpcio",
   "protobuf",

{remoterf_server-0.1.96 → remoterf_server-0.1.97}/src/remoteRF_server/server/device_manager.py

@@ -212,34 +212,61 @@ def _local_devices_str_snapshot() -> Dict[int, str]:
             out[int(gid)] = f"{name} [{', '.join(meta_parts)}] ({status})"
     return out
 
-
 def _host_devices_str_snapshot() -> Dict[int, str]:
-    _sync_host_devices(force=True)
-
+    _sync_host_devices()  # ensure host devices are up-to-date before snapshot
     reg = _get_host_registry()
     if reg is None:
         return {}
 
-    snap = reg.device_directory_cached(ttl_ms=0)
+    snap = reg.device_directory_cached(ttl_ms=0)  # device_id -> (host_id, info_obj, is_active)
+
+    try:
+        status_map = reg.list_devices()  # device_id -> DeviceStatus
+    except Exception:
+        status_map = {}
+
+    now_ms = int(time.time() * 1000)
 
     out: Dict[int, str] = {}
     for device_id, (host_id, info_obj, is_active) in snap.items():
+        # Prefer numeric device_id (old world), otherwise fall back to local_id (compat/UI key).
         try:
             gid = int(str(device_id))
         except Exception:
-            continue
+            try:
+                gid = int(getattr(info_obj, "local_id", 0) or 0)
+            except Exception:
+                continue
+            if gid <= 0:
+                continue
 
+        local_id = int(getattr(info_obj, "local_id", 0) or 0)
         label = str(getattr(info_obj, "label", "") or "").strip()
+        serial = str(getattr(info_obj, "serial", "") or "").strip()
+        kind = str(getattr(info_obj, "kind", "") or "").strip()
+
         status = "online" if bool(is_active) else "offline"
         name = label or f"host-device-{gid}"
 
-        # reservation flag from _devices
-        with _state_lock:
-            st = _devices.get(int(gid))
-            if st and (st.salt or st.hsh):
-                status = status + ", reserved"
-
-        out[gid] = f"{name} ({status})"
+        last_seen = ""
+        ds = status_map.get(str(device_id))
+        if ds is not None:
+            try:
+                ls = int(getattr(ds, "last_seen_ms", 0) or 0)
+                if ls > 0:
+                    age_s = max(0, (now_ms - ls) // 1000)
+                    last_seen = f", seen={age_s}s ago"
+            except Exception:
+                pass
+
+        out[gid] = (
+            f"{name} "
+            f"[host={host_id}, local_id={local_id}"
+            f"{', kind=' + kind if kind else ''}"
+            f"{', serial=' + serial if serial else ''}"
+            f"{last_seen}"
+            f"] ({status})"
+        )
 
     return out
 

{remoterf_server-0.1.96 → remoterf_server-0.1.97}/src/remoteRF_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 0.1.96
+Version: 0.1.97
 Description-Content-Type: text/markdown
 Requires-Dist: grpcio
 Requires-Dist: protobuf