clean up parsing

Author: Arqu

netsim/main.py

@@ -65,14 +65,15 @@ def parse_node_params(node, prefix, node_params, runner_id):
                             node_params[node_name] = lines[idx + 1].strip()
                         break
                     if node["param_parser"] == "iroh_endpoint_with_addrs":
-                        # Handle both "Our endpoint id:" (from bind_endpoint) and "Endpoint id:" (from provide)
-                        if line.startswith("Our endpoint id:"):
+                        # Look for "Endpoint id:" followed by direct addresses
+                        if line.startswith("Endpoint id:"):
                             if idx + 1 >= len(lines):
                                 break
                             endpoint_id = lines[idx + 1].strip()
                             direct_addrs = []
+                            # Look for "Direct addresses:" after the endpoint ID
                             j = idx + 2
-                            if j < len(lines) and lines[j].startswith("Our direct addresses:"):
+                            if j < len(lines) and lines[j].startswith("Direct addresses:"):
                                 j += 1
                                 while j < len(lines) and lines[j].startswith("\t"):
                                     direct_addrs.append(lines[j].strip())
@@ -82,28 +83,6 @@ def parse_node_params(node, prefix, node_params, runner_id):
                                 "direct_addrs": direct_addrs
                             }
                             break
-                        elif line.startswith("Endpoint id:") and node_name not in node_params:
-                            # Fallback for simple "Endpoint id:" output (no "Our")
-                            # Format: "Endpoint id:\n<id>\n"
-                            if idx + 1 < len(lines):
-                                endpoint_id = lines[idx + 1].strip()
-                                # Try to find direct addresses from debug logs
-                                direct_addrs = []
-                                # Look backwards and forwards for direct_addrs debug line
-                                for search_idx in range(max(0, idx - 20), min(len(lines), idx + 20)):
-                                    search_line = lines[search_idx]
-                                    if "direct_addrs:" in search_line and "DirectAddr" in search_line:
-                                        # Extract address from: addrs={DirectAddr { addr: 10.0.0.2:47103, typ: Local }}
-                                        import re
-                                        match = re.search(r'addr:\s*([0-9.]+:\d+)', search_line)
-                                        if match:
-                                            direct_addrs.append(match.group(1))
-                                            break
-                                node_params[node_name] = {
-                                    "endpoint_id": endpoint_id,
-                                    "direct_addrs": direct_addrs
-                                }
-                                break
     return node_params