Sync from GitHub with Git LFS

agents/peer_sync.py

@@ -9,6 +9,7 @@ import ipaddress
 import re
 from tools.storage import Storage
 from datetime import datetime
+import select
 
 storage = Storage()
 my_id = storage.get_config_value("agent_id", str(uuid.uuid4()))
@@ -62,7 +63,7 @@ tcp_ports, udp_ports = get_listening_ports()
 # LAN Discovery (только local_addresses)
 # ======================
 def lan_discovery():
-    DISCOVERY_INTERVAL = 300
+    DISCOVERY_INTERVAL = 30
     local_addresses = storage.get_config_value("local_addresses", [])
     udp_port_set = set()
     for a in local_addresses:
@@ -127,18 +128,34 @@ def udp_discovery_listener():
 
                 name = msg.get("name", "unknown")
                 addresses = msg.get("addresses", [f"{addr[0]}:{sock.getsockname()[1]}"])
-                normalized_addresses = []
+
+                expanded_addresses = []
                 for a in addresses:
                     norm = storage.normalize_address(a)
                     if norm is None:
                         continue
-                    proto, _ = norm.split("://")
-                    if proto in ["udp", "any"]:
-                        normalized_addresses.append(norm)
+                    proto, rest = norm.split("://", 1)
 
-                if normalized_addresses:
-                    storage.add_or_update_peer(peer_id, name, normalized_addresses, "discovery", "online")
-            except:
+                    # --- фильтруем loopback ---
+                    host_port = rest.split(":")[0]
+                    if host_port.startswith("127."):
+                        continue
+
+                    if proto == "udp":
+                        expanded_addresses.append(f"udp://{rest}")
+                        expanded_addresses.append(f"tcp://{rest}")
+                    elif proto == "any":
+                        expanded_addresses.append(f"udp://{rest}")
+                        expanded_addresses.append(f"tcp://{rest}")
+                    elif proto == "tcp":
+                        expanded_addresses.append(f"tcp://{rest}")
+
+                if expanded_addresses:
+                    print(f"[UDP Discovery] получен пакет от {addr}, id={peer_id}, "
+                          f"addresses(raw)={addresses}, addresses(expanded)={expanded_addresses}")
+                    storage.add_or_update_peer(peer_id, name, expanded_addresses, "discovery", "online")
+            except Exception as e:
+                print(f"[UDP Discovery] ошибка при обработке пакета: {e}")
                 continue
 
 # ======================
@@ -173,6 +190,56 @@ def udp_discovery_sender():
             last_broadcast = now
         time.sleep(1)
 
+# ======================
+# TCP Listener (для Peer Exchange)
+# ======================
+def tcp_listener():
+    sockets = []
+    for host, port in tcp_ports:
+        try:
+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            bind_host = "" if host in ["0.0.0.0", "any"] else host
+            sock.bind((bind_host, port))
+            sock.listen(5)
+            sockets.append(sock)
+            print(f"[TCP Listener] Слушаем на {bind_host}:{port}")
+        except Exception as e:
+            print(f"[TCP Listener] Ошибка bind/listen {host}:{port} -> {e}")
+
+    while True:
+        if not sockets:
+            time.sleep(1)
+            continue
+        readable, _, _ = select.select(sockets, [], [], 1)
+        for s in readable:
+            try:
+                conn, addr = s.accept()
+                data = conn.recv(1024)
+                if data == b"PEER_EXCHANGE_REQUEST":
+                    print(f"[TCP Listener] Получен PEER_EXCHANGE_REQUEST от {addr}")
+                    try:
+                        peers = []
+                        for pid, addresses_json in storage.get_online_peers(limit=50):
+                            try:
+                                addresses = json.loads(addresses_json)
+                            except Exception:
+                                addresses = []
+                            peers.append({
+                                "id": pid,
+                                "addresses": addresses
+                            })
+                        payload = json.dumps(peers).encode("utf-8")
+                        conn.sendall(payload)
+                        print(f"[TCP Listener] Отправлен список пиров ({len(peers)}) в {addr}")
+                    except Exception as e:
+                        print(f"[TCP Listener] Ошибка при отправке списка пиров: {e}")
+                conn.close()
+            except Exception as e:
+                print(f"[TCP Listener] Ошибка при обработке соединения: {e}")
+                continue
+
+
 # ======================
 # Peer Exchange (TCP)
 # ======================
@@ -194,6 +261,7 @@ def peer_exchange():
                     proto, hostport = norm.split("://")
                     if proto not in ["tcp", "any"]:
                         continue
+
                     try:
                         host, port = parse_hostport(hostport)
                         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -218,6 +286,7 @@ def start_sync():
     threading.Thread(target=udp_discovery_sender, daemon=True).start()
     threading.Thread(target=peer_exchange, daemon=True).start()
     threading.Thread(target=lan_discovery, daemon=True).start()
+    threading.Thread(target=tcp_listener, daemon=True).start()
 
     while True:
-        time.sleep(60)
+        time.sleep(60)

agents/start_repl.py

@@ -4,7 +4,7 @@ import threading
 
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
-from agents.init import ensure_db_initialized
+from init import ensure_db_initialized
 from tools.storage import Storage
 
 # Проверка инициализации (вернёт config, если всё ОК)
@@ -28,7 +28,7 @@ def start_all():
     if ENABLE_REPL:
         if not storage.is_process_alive("REPL", max_delay=180):
             def repl():
-                from agents.repl import start_repl
+                from repl import start_repl
                 start_repl()
             threads.append(threading.Thread(target=repl, name="REPL"))
         else:
@@ -37,7 +37,7 @@ def start_all():
     if ENABLE_UI:
         if not storage.is_process_alive("NotebookUI", max_delay=180):
             def ui():
-                from agents.web_ui import start_notebook
+                from web_ui import start_notebook
                 start_notebook()
             threads.append(threading.Thread(target=ui, name="NotebookUI"))
         else:
@@ -46,7 +46,7 @@ def start_all():
     if ENABLE_MESH:
         if not storage.is_process_alive("MeshListener", max_delay=180):
             def mesh():
-                from agents.agent_mesh_listener import start_listener
+                from agent_mesh_listener import start_listener
                 start_listener()
             threads.append(threading.Thread(target=mesh, name="MeshListener"))
         else:
@@ -55,7 +55,7 @@ def start_all():
     if ENABLE_SYNC:
         if not storage.is_process_alive("PeerSync", max_delay=180):
             def sync():
-                from agents.peer_sync import start_sync
+                from peer_sync import start_sync
                 start_sync()
             threads.append(threading.Thread(target=sync, name="PeerSync"))
         else:
@@ -64,7 +64,7 @@ def start_all():
     if ENABLE_TRANSPORT:
         if not storage.is_process_alive("Transporter", max_delay=180):
             def transport():
-                from agents.transporter import start_transporter
+                from transporter import start_transporter
                 start_transporter()
             threads.append(threading.Thread(target=transport, name="Transporter"))
         else:
@@ -73,7 +73,7 @@ def start_all():
     if ENABLE_CONTROL:
         if not storage.is_process_alive("Controller", max_delay=180):
             def control():
-                from agents.agent_controller import start_controller
+                from agent_controller import start_controller
                 start_controller()
             threads.append(threading.Thread(target=control, name="Controller"))
         else:
@@ -82,7 +82,7 @@ def start_all():
     if ENABLE_CONTAINER:
         if not storage.is_process_alive("ContainerAgent", max_delay=180):
             def container():
-                from agents.container_agent import start_container
+                from container_agent import start_container
                 start_container()
             threads.append(threading.Thread(target=container, name="ContainerAgent"))
         else:
@@ -91,7 +91,7 @@ def start_all():
     if ENABLE_ETHICS:
         if not storage.is_process_alive("EthicsGuard", max_delay=180):
             def ethics():
-                from agents.ethics_guard import start_ethics_guard
+                from ethics_guard import start_ethics_guard
                 start_ethics_guard()
             threads.append(threading.Thread(target=ethics, name="EthicsGuard"))
         else:

agents/web_ui.py

@@ -13,7 +13,7 @@ from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 from starlette.middleware.sessions import SessionMiddleware
-from agents.notebook.views import router as notebook_router
+from notebook.views import router as notebook_router
 from tools.storage import Storage
 
 storage = Storage()