fixed typos, added log for deref handler, restructured start dependency order so that the handshaker runs before other components which make network requests, temporarily removed handshaker from error handler, fixed var name typo in sync manager which never matched any nodes to catch up with, node contact handler now skips partial nodes instead of raising a warning log

Author: lukvmil

src/koi_net/components/effector.py

@@ -31,6 +31,7 @@ class Effector:
 
     def register_handler(self, handler: "DerefHandler"):
         self.deref_handlers.append(handler)
+        self.log.info(f"Registered deref handler {handler.__class__.__name__}")
 
     def _try_cache(self, rid: RID) -> tuple[Bundle, BundleSource] | None:
         bundle = self.cache.read(rid)

src/koi_net/components/error_handler.py

@@ -6,7 +6,6 @@
 from koi_net.protocol.errors import ErrorType
 from koi_net.protocol.event import EventType
 
-from .handshaker import Handshaker
 from .kobj_queue import KobjQueue
 
 
@@ -15,7 +14,6 @@ class ErrorHandler:
     """Handles network and protocol errors that may occur during requests."""
     log: Logger
     kobj_queue: KobjQueue
-    handshaker: Handshaker
 
     timeout_counter: dict[KoiNetNode, int] = field(init=False, default_factory=dict)
 
@@ -51,10 +49,7 @@ def handle_protocol_error(
 
         self.log.info(f"Handling protocol error {error_type} for node {node!r}")
         match error_type:
-            case ErrorType.UnknownNode:
-                self.log.info("Peer doesn't know me, attempting handshake...")
-                self.handshaker.handshake_with(node)
-                
+            case ErrorType.UnknownNode: ...
             case ErrorType.InvalidKey: ...
             case ErrorType.InvalidSignature: ...
             case ErrorType.InvalidTarget: ...

src/koi_net/components/handshaker.py

@@ -9,7 +9,7 @@
 
 from .graph import NetworkGraph
 from .identity import NodeIdentity
-from .event_queue import EventQueue
+from .request_handler import RequestHandler
 
 
 @dataclass
@@ -19,9 +19,9 @@ class Handshaker:
     log: Logger
     cache: Cache
     identity: NodeIdentity
-    event_queue: EventQueue
     config: BaseNodeConfig
     graph: NetworkGraph
+    request_handler: RequestHandler
 
     @depends_on("graph", "profile_monitor", "server", "event_worker")
     def start(self):
@@ -51,15 +51,14 @@ def handshake_with(self, target: KoiNetNode):
         """
 
         self.log.debug(f"Initiating handshake with {target}")
-        self.event_queue.push(
-            Event.from_rid(
-                event_type=EventType.FORGET, 
-                rid=self.identity.rid),
-            target=target
-        )
-        self.event_queue.push(
-            event=Event.from_bundle(
-                event_type=EventType.NEW, 
-                bundle=self.cache.read(self.identity.rid)),
-            target=target
+        self.request_handler.broadcast_events(
+            node=target,
+            events=[
+                Event.from_rid(
+                    event_type=EventType.FORGET, 
+                    rid=self.identity.rid),
+                Event.from_bundle(
+                    event_type=EventType.NEW, 
+                    bundle=self.cache.read(self.identity.rid))
+            ]
         )

src/koi_net/components/knowledge_handlers/node_contact_handler.py

@@ -36,6 +36,9 @@ def process_node(self, node_rid: KoiNetNode, node_bundle: Bundle):
 
         node_profile = node_bundle.validate_contents(NodeProfile)
 
+        if node_profile.node_type is NodeType.PARTIAL:
+            return
+        
         # None indicates interest in all types, while an empty list would indicate interest in no types
         if self.config.koi_net.rid_types_of_interest is None:
             available_rid_types = node_profile.provides.event

src/koi_net/components/kobj_queue.py

@@ -59,5 +59,4 @@ def wait(self):
             if self.q.unfinished_tasks == 0:
                 return
 
-        print("WAIT FAILED")
         raise RuntimeError("Shutdown while awaiting queue")

src/koi_net/components/poller.py

@@ -36,7 +36,7 @@ def run(self):
             wait_time = max(0, self.config.poller.polling_interval - elapsed)
             self.exit_event.wait(wait_time)
 
-    @depends_on("graph")
+    @depends_on("graph", "profile_monitor")
     def start(self):
         self.exit_event.clear()
         super().start()

src/koi_net/components/secure_manager.py

@@ -81,7 +81,7 @@ def load_priv_key(self):
             raise
 
     def handle_unknown_node(self, envelope: SignedEnvelope) -> Bundle | None:
-        """Attempts to find node profile in proided envelope.
+        """Attempts to find node profile in provided envelope.
         
         If an unknown node sends an envelope, it may still be able to be
         validated if that envelope contains their node profile. This is
@@ -97,7 +97,7 @@ def handle_unknown_node(self, envelope: SignedEnvelope) -> Bundle | None:
             if event.rid != envelope.source_node:
                 continue
             if event.event_type != EventType.NEW:
-                continue            
+                continue
 
             return event.bundle
         return None

src/koi_net/components/sync_manager.py

@@ -24,15 +24,15 @@ class SyncManager:
     request_handler: RequestHandler
     kobj_queue: KobjQueue
 
-    @depends_on("graph", "kobj_worker")
+    @depends_on("graph", "kobj_worker", "handshaker")
     def start(self):
         """Catches up with providers on startup."""
         self.catch_up_with_all(self.config.koi_net.rid_types_of_interest)
 
     def catch_up_with_all(self, rid_types: list[RIDType]):
         node_providers = []
         for rid_type in rid_types:
-            providers = self.graph.get_neighbors(
+            node_providers = self.graph.get_neighbors(
                 direction="in",
                 allowed_type=rid_type
             )