node cleanup

NikolayBlagoev · Apr 13, 2024 · 98d2a3f · 98d2a3f
1 parent 9fc9bae
commit 98d2a3f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/deccom/nodes/streamnode.py b/deccom/nodes/streamnode.py
@@ -30,14 +30,18 @@ def __init__(self, p: Peer, protocol: StreamProtocol, ip_addr="0.0.0.0", port=No
 
     async def listen(self):
         loop = asyncio.get_running_loop()
-        listen = loop.create_datagram_endpoint(self.protocol_type.get_lowest, local_addr=(self.ip_addr, self.port))
-        self.transport, self.protocol = await listen
+        self.udp = loop.create_datagram_endpoint(self.protocol_type.get_lowest, local_addr=(self.ip_addr, self.port))
+
+        self.transport, self.protocol = await self.udp
         print(self.protocol_type.get_lowest_stream().handle_connection)
         self.server = await asyncio.start_server(
                 self.protocol_type.get_lowest_stream().handle_connection, sock=self.s)
 
         await self.protocol_type.start(self.peer)
-
+    async def close(self):
+        self.udp.close()
+        self.transport.close()
+        self.server.close()
     async def stream_data(self, node_id, data):
         # print("sending stream")
 

diff --git a/deccom/protocols/abstractprotocol.py b/deccom/protocols/abstractprotocol.py
@@ -45,6 +45,8 @@ def check_if_have(submodule, attr, name = None)->bool:
     async def _lower_stop(self):
         return
     async def stop(self):
+        if not self.started:
+            return
         self.started = False
 
         return await self._lower_stop()

diff --git a/deccom/protocols/streamprotocol.py b/deccom/protocols/streamprotocol.py
@@ -40,7 +40,7 @@ class StreamProtocol(AbstractProtocol):
                     "_lower_get_peer": "get_peer",
 
                 })
-    required_lower = AbstractProtocol.required_lower + ["get_peer", "set_connected_callback", "set_disconnected_callback"]
+    required_lower = AbstractProtocol.required_lower + ["get_peer"]
     def __init__(self, always_connect: bool, submodule=None, callback: Callable[[tuple[str, int], bytes], None] = lambda addr, data: print(addr, data),disconnected_callback = lambda addr,nodeid: print(nodeid, "disconnected"), 
                 connected_callback = lambda addr, peer: ..., stream_callback = lambda data, node_id, addr: ..., stream_close_callback = lambda node_id,addr: ...):
         super().__init__(submodule, callback)