Harden reverse pipe device status

Author: ArthurkaX

cli/external_engine/reverse_pipe_client.py

@@ -340,8 +340,32 @@ def send_command(self, method: str, params: dict | None = None) -> dict:
             cmd = {"method": method, "params": params}
             _write_msg(pipe_handle, cmd)
 
-            # Read response
-            response = _read_msg(pipe_handle)
+            # Read response with the same deadline. CODESYS API calls can
+            # block after the IDE has already accepted the pipe request.
+            box: dict[str, Any] = {}
+
+            def _reader():
+                try:
+                    box["response"] = _read_msg(pipe_handle)
+                except Exception as exc:
+                    box["error"] = exc
+
+            reader = threading.Thread(target=_reader, daemon=True)
+            reader.start()
+            reader.join(self._timeout)
+            if reader.is_alive():
+                CancelIo(pipe_handle)
+                CloseHandle(pipe_handle)
+                pipe_handle = -1
+                raise RuntimeError(
+                    f"Timeout ({self._timeout}s) waiting for IDE response to "
+                    f"'{method}'. The daemon accepted the command but did not "
+                    f"return a response. Check the CODESYS window for modal "
+                    f"dialogs or restart Project_daemon.py."
+                )
+            if "error" in box:
+                raise box["error"]
+            response = box.get("response", {})
 
             # Cache PID from responses that include it
             if isinstance(response, dict):
@@ -398,4 +422,4 @@ def send_command_reverse(method: str, params: dict | None = None,
     except RuntimeError as e:
         print(f"Error: {e}")
     except Exception as e:
-        print(f"Unexpected error: {e}")
+        print(f"Unexpected error: {e}")

src/ide_bridge/ide_daemon.pyw

@@ -813,36 +813,29 @@ class DaemonPipeServer(object):
             return err
         try:
             device_filter = (params.get("device") or "").lower()
-            all_objs = list(project.get_children(recursive=True))
             status_list = []
-            # Properties to try for each object
-            status_props = [
-                'IsOnline', 'IsConnected', 'State', 'Online', 'Connected',
-                'Status', 'IsActive', 'IsRunning', 'DeviceState',
-                'get_IsOnline', 'get_IsConnected', 'get_State',
-            ]
-            for obj in all_objs:
+
+            app = _ide_online_helpers.get_active_application(project)
+            if app is not None:
                 try:
-                    name = self._obj_name(obj)
-                    if not name:
-                        continue
-                    path = self._build_path(obj)
-                    entry = {"name": name, "path": path}
-                    for prop in status_props:
-                        try:
-                            val = getattr(obj, prop)
-                            if val is not None:
-                                if callable(val):
-                                    entry[prop] = str(val())
-                                else:
-                                    entry[prop] = str(val)
-                        except Exception:
-                            pass
-                    if len(entry) > 2:  # has at least one status prop
-                        if not device_filter or device_filter in name.lower():
-                            status_list.append(entry)
+                    name = self._obj_name(app)
                 except Exception:
-                    pass
+                    name = "Application"
+                entry = {
+                    "name": name,
+                    "path": self._build_path(app),
+                    "connected": "false",
+                }
+                state = getattr(sys, "_codesys_daemon_loop", {})
+                online_app = state.get("online_app") if isinstance(state, dict) else None
+                if online_app is not None:
+                    entry["connected"] = "true"
+                    try:
+                        entry["application_state"] = str(online_app.application_state)
+                    except Exception as e:
+                        entry["application_state_error"] = str(e)
+                if not device_filter or device_filter in name.lower():
+                    status_list.append(entry)
             return {"ok": True, "data": {"devices": status_list}}
         except Exception as e:
             return {"ok": False, "error": "Device status error: {0}".format(e)}

src/ide_bridge/ide_reverse_pipe_loop.py

@@ -1007,34 +1007,28 @@ def _cmd_device_status(params):
         return err
     try:
         device_filter = (params.get("device") or "").lower()
-        all_objs = _get_device_objects(project)
         status_list = []
-        status_props = [
-            'IsOnline', 'IsConnected', 'State', 'Online', 'Connected',
-            'Status', 'IsActive', 'IsRunning', 'DeviceState',
-        ]
-        for obj in all_objs:
+
+        app = _helpers.get_active_application(project)
+        if app is not None:
             try:
-                name = _obj_name(obj)
-                if not name:
-                    continue
-                path = _build_path(obj)
-                entry = {"name": name, "path": path}
-                for prop in status_props:
-                    try:
-                        val = getattr(obj, prop)
-                        if val is not None:
-                            if callable(val):
-                                entry[prop] = str(val())
-                            else:
-                                entry[prop] = str(val)
-                    except Exception:
-                        pass
-                if len(entry) > 2:
-                    if not device_filter or device_filter in name.lower():
-                        status_list.append(entry)
+                name = _obj_name(app)
             except Exception:
-                pass
+                name = "Application"
+            entry = {
+                "name": name,
+                "path": _build_path(app),
+                "connected": "false",
+            }
+            online_app = sys._codesys_daemon_loop.get("online_app")
+            if online_app is not None:
+                entry["connected"] = "true"
+                try:
+                    entry["application_state"] = str(online_app.application_state)
+                except Exception as e:
+                    entry["application_state_error"] = str(e)
+            if not device_filter or device_filter in name.lower():
+                status_list.append(entry)
         return {"ok": True, "data": {"devices": status_list}}
     except Exception as e:
         return {"ok": False, "error": "Device status error: {0}".format(e)}