remoteRF-server 0.1.91__tar.gz → 0.1.92__tar.gz

{remoterf_server-0.1.91 → remoterf_server-0.1.92}/PKG-INFO

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

{remoterf_server-0.1.91 → remoterf_server-0.1.92}/pyproject.toml

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

{remoterf_server-0.1.91 → remoterf_server-0.1.92}/src/remoteRF_server/server/device_manager.py

@@ -69,46 +69,138 @@ 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]:
+    # DEBUG: print EVERYTHING we can without crashing the UI path.
+    def _dbg(msg: str) -> None:
+        try:
+            pass
+            # print(f"[host_devices_snapshot][DEBUG] {msg}", file=sys.stderr, flush=True)
+        except Exception:
+            pass
+
     reg = _get_host_registry()
     if reg is None:
+        _dbg("registry=None -> returning {}")
         return {}
 
-    snap = reg.device_directory_cached(ttl_ms=0)  # device_id -> (host_id, info_obj, is_active)
+    # force refresh of directory snapshot
+    try:
+        snap = reg.device_directory_cached(ttl_ms=0)  # device_id -> (host_id, info_obj, is_active)
+        _dbg(f"device_directory_cached(ttl_ms=0) returned {len(snap)} entries")
+    except Exception as e:
+        _dbg(f"device_directory_cached FAILED: {e!r}")
+        return {}
 
+    # optional: last-seen data (persisted in registry status)
     try:
         status_map = reg.list_devices()  # device_id -> DeviceStatus
-    except Exception:
+        _dbg(f"list_devices() returned {len(status_map)} entries")
+    except Exception as e:
+        _dbg(f"list_devices() FAILED: {e!r}")
         status_map = {}
 
     now_ms = int(time.time() * 1000)
 
     out: Dict[int, str] = {}
-    for device_id, (host_id, info_obj, is_active) in snap.items():
-        # Canonical: treat device_id as numeric gid
+    for device_id, tup in snap.items():
+        # snap is expected: (host_id, info_obj, is_active)
         try:
-            gid = int(str(device_id))
-        except Exception:
+            host_id, info_obj, is_active = tup
+        except Exception as e:
+            _dbg(f"BAD SNAP TUPLE device_id={device_id!r} tup={tup!r} err={e!r}")
             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()
+        _dbg(
+            f"ENTRY device_id(raw)={device_id!r} device_id(str)={str(device_id)!r} "
+            f"host_id={host_id!r} is_active={bool(is_active)} "
+            f"info_obj_type={type(info_obj).__name__}"
+        )
+
+        # Dump info_obj fields (best effort)
+        try:
+            local_id = int(getattr(info_obj, "local_id", 0) or 0)
+        except Exception as e:
+            local_id = 0
+            _dbg(f"  info_obj.local_id read failed: {e!r}")
+
+        try:
+            label = str(getattr(info_obj, "label", "") or "").strip()
+        except Exception as e:
+            label = ""
+            _dbg(f"  info_obj.label read failed: {e!r}")
+
+        try:
+            serial = str(getattr(info_obj, "serial", "") or "").strip()
+        except Exception as e:
+            serial = ""
+            _dbg(f"  info_obj.serial read failed: {e!r}")
+
+        try:
+            kind = str(getattr(info_obj, "kind", "") or "").strip()
+        except Exception as e:
+            kind = ""
+            _dbg(f"  info_obj.kind read failed: {e!r}")
+
+        # Extra: if it's a protobuf message, print its text format safely
+        try:
+            # Many protobuf messages have ListFields()/__repr__/__str__
+            _dbg(f"  info_obj(str)={str(info_obj)[:500]!r}")
+        except Exception:
+            pass
+
+        _dbg(
+            f"  parsed info: local_id={local_id} label={label!r} kind={kind!r} serial={serial!r}"
+        )
+
+        # If you suspect server is setting label/kind to gid/local_id, explicitly flag it.
+        if label and (label == str(local_id) or label == str(device_id)):
+            _dbg(f"  *** SUSPICIOUS label looks like an id: label={label!r} local_id={local_id} device_id={device_id!r}")
+        if kind and (kind == str(local_id) or kind == str(device_id)):
+            _dbg(f"  *** SUSPICIOUS kind looks like an id: kind={kind!r} local_id={local_id} device_id={device_id!r}")
+
+        # Your old code assumed device_id is numeric gid. DEBUG: show both interpretations.
+        gid_from_device_id: Optional[int] = None
+        gid_from_local_id: Optional[int] = None
+
+        try:
+            gid_from_device_id = int(str(device_id))
+            _dbg(f"  gid_from_device_id=int({str(device_id)!r}) -> {gid_from_device_id}")
+        except Exception as e:
+            _dbg(f"  gid_from_device_id FAILED int({str(device_id)!r}): {e!r}")
+
+        try:
+            gid_from_local_id = int(local_id)
+            _dbg(f"  gid_from_local_id=int(local_id={local_id}) -> {gid_from_local_id}")
+        except Exception as e:
+            _dbg(f"  gid_from_local_id FAILED int(local_id={local_id}): {e!r}")
+
+        # Prefer gid derived from device_id if possible; else fall back to local_id
+        gid: Optional[int] = gid_from_device_id if gid_from_device_id is not None else gid_from_local_id
+        if gid is None:
+            _dbg("  SKIP: cannot derive gid from device_id or local_id")
+            continue
 
         status = "online" if bool(is_active) else "offline"
         name = label or f"host-device-{gid}"
 
+        # last-seen
         last_seen = ""
         ds = status_map.get(str(device_id))
-        if ds is not None:
+        if ds is None:
+            _dbg(f"  status_map: no entry for device_id={str(device_id)!r}")
+        else:
             try:
                 ls = int(getattr(ds, "last_seen_ms", 0) or 0)
+                hid2 = str(getattr(ds, "host_id", "") or "")
+                # if server still stores host_local_id, print it too (best-effort)
+                hloc = getattr(ds, "host_local_id", None)
+                _dbg(f"  status: host_id={hid2!r} last_seen_ms={ls} host_local_id={hloc!r}")
                 if ls > 0:
                     age_s = max(0, (now_ms - ls) // 1000)
                     last_seen = f", seen={age_s}s ago"
-            except Exception:
-                pass
+            except Exception as e:
+                _dbg(f"  status_map parse failed for device_id={str(device_id)!r}: {e!r}")
 
+        # Final formatted string (same output contract as before)
         out[gid] = (
             f"{name} "
             f"[host={host_id}, local_id={local_id}"
@@ -118,6 +210,9 @@ def _host_devices_str_snapshot() -> Dict[int, str]:
             f"] ({status})"
         )
 
+        _dbg(f"  OUT[{gid}]={out[gid]!r}")
+
+    _dbg(f"returning out size={len(out)} gids={sorted(out.keys())[:50]!r}{'...' if len(out) > 50 else ''}")
     return out
 
 # -----------------------------

{remoterf_server-0.1.91 → remoterf_server-0.1.92}/src/remoteRF_server.egg-info/PKG-INFO

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