socketflow 0.1.3__tar.gz → 0.1.4__tar.gz

{socketflow-0.1.3 → socketflow-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: socketflow
-Version: 0.1.3
+Version: 0.1.4
 Summary: TCP networking for Python, without the boilerplate.
 Home-page: https://github.com/ayammaximilian/socketflow
 Author: SocketFlow Team

{socketflow-0.1.3 → socketflow-0.1.4}/socketflow/__init__.py

@@ -20,7 +20,7 @@ from .global_side.exceptions import (
     ExceptionType,
 )
 
-__version__ = "0.1.3"
+__version__ = "0.1.4"
 __all__ = [
     "TcpServer",
     "TcpClient",

{socketflow-0.1.3 → socketflow-0.1.4}/socketflow/client_side/client.py

@@ -5,6 +5,7 @@ from ..global_side.event import (
     ConnectData,
     DisconnectData,
     MessageReceivedData,
+    ResponseData,
     ErrorData,
 )
 from ..global_side.dispatcher import EventDispatcher
@@ -86,14 +87,17 @@ class TcpClientProtocol:
                 server_addr = (
                     self.socket.getpeername() if self.socket else ("unknown", 0)
                 )
+                wait_response = headers.get("wait_response", False)
                 event_data = MessageReceivedData(
-                    data=body, server_addr=server_addr, data_id=data_id
+                    data=body, server_addr=server_addr, data_id=data_id,
+                    direct_response=wait_response
                 )
 
+                # Resolve pending wait_response futures
                 if data_id and data_id in self.client.pending_responses:
                     future = self.client.pending_responses.pop(data_id)
                     if hasattr(future, "set_result") and not future.done():
-                        future.set_result(body)
+                        future.set_result(ResponseData(data=body, data_id=data_id))
                     continue
 
                 if path:
@@ -294,6 +298,7 @@ class TcpClient:
             "type": "__user__",
             "id": data_id,
             "path": path,
+            "wait_response": wait_response,
         }
 
         if self.compress:
@@ -337,7 +342,9 @@ class TcpClient:
                             )
                         )
 
-            threading.Timer(wait_response_timeout, timeout_handler).start()
+            timer = threading.Timer(wait_response_timeout, timeout_handler)
+            timer.daemon = True
+            timer.start()
 
             try:
                 return future.result()
@@ -354,6 +361,7 @@ class TcpClient:
                     f"Error while waiting for response: {e}"
                 )
             finally:
+                timer.cancel()
                 self.pending_responses.pop(data_id, None)
 
     def wait(self):

{socketflow-0.1.3 → socketflow-0.1.4}/socketflow/global_side/event.py

@@ -33,6 +33,13 @@ class MessageReceivedData:
     server_addr: Optional[Tuple[str, int]] = None
     data_id: Optional[str] = None
     params: Dict[str, str] = field(default_factory=dict)
+    direct_response: bool = False
+
+
+@dataclass
+class ResponseData:
+    data: Any
+    data_id: Optional[str] = None
 
 
 @dataclass

{socketflow-0.1.3 → socketflow-0.1.4}/socketflow/server_side/server.py

@@ -13,6 +13,7 @@ from ..global_side.event import (
     ErrorData,
     EventType,
     MessageReceivedData,
+    ResponseData,
     ServerStartData,
     ServerStopData,
 )
@@ -86,14 +87,17 @@ class TcpServerProtocol:
             elif msg_type == "__user__":
                 path = headers.get("path")
                 data_id = headers.get("id")
+                wait_response = headers.get("wait_response", False)
                 event_data = MessageReceivedData(
-                    data=body, client_addr=self.client_addr, data_id=data_id
+                    data=body, client_addr=self.client_addr, data_id=data_id,
+                    direct_response=wait_response
                 )
 
+                # Resolve pending wait_response futures
                 if data_id and data_id in self.server.pending_responses:
                     future = self.server.pending_responses.pop(data_id)
                     if hasattr(future, "set_result") and not future.done():
-                        future.set_result(body)
+                        future.set_result(ResponseData(data=body, data_id=data_id))
                     continue
 
                 if path:
@@ -305,6 +309,7 @@ class TcpServer:
             "type": "__user__",
             "id": data_id,
             "path": path,
+            "wait_response": wait_response,
         }
 
         if self.compress:

{socketflow-0.1.3 → socketflow-0.1.4}/socketflow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: socketflow
-Version: 0.1.3
+Version: 0.1.4
 Summary: TCP networking for Python, without the boilerplate.
 Home-page: https://github.com/ayammaximilian/socketflow
 Author: SocketFlow Team