socketflow 0.1.2__tar.gz → 0.1.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: socketflow
-Version: 0.1.2
+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.2 → socketflow-0.1.4}/socketflow/__init__.py

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

{socketflow-0.1.2 → 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):
@@ -375,8 +383,8 @@ class TcpClient:
     def event(self, event_type: str):
         return self.dispatcher.event(event_type)
 
-    def path(self, path: str, middleware=None):
-        return self.dispatcher.path(path, middleware)
+    def path(self, path: str, middleware=None, block: bool = False):
+        return self.dispatcher.path(path, middleware, block)
 
     def register_blueprint(self, blueprint):
         blueprint._client = self  # Associate blueprint with this client

{socketflow-0.1.2 → socketflow-0.1.4}/socketflow/global_side/blueprint.py

@@ -8,6 +8,7 @@ class Blueprint:
         self._event_handlers: Dict[str, List[Callable]] = {}
         self._path_handlers: Dict[str, List[Callable]] = {}
         self._path_middleware: Dict[str, List[Callable]] = {}
+        self._path_blocking: Dict[str, bool] = {}
 
     def event(self, event_type: str):
         """Decorator for event handlers"""
@@ -18,11 +19,11 @@ class Blueprint:
 
         return decorator
 
-    def path(self, path: str, middleware=None):
+    def path(self, path: str, middleware=None, block: bool = False):
         """Decorator for path handlers"""
 
         def decorator(func):
-            self.register_path(path, func, middleware)
+            self.register_path(path, func, middleware, block)
             return func
 
         return decorator
@@ -33,7 +34,7 @@ class Blueprint:
             self._event_handlers[event_type] = []
         self._event_handlers[event_type].append(handler)
 
-    def register_path(self, path: str, handler: Callable, middleware=None):
+    def register_path(self, path: str, handler: Callable, middleware=None, block: bool = False):
         """Register a path handler"""
         if path not in self._path_handlers:
             self._path_handlers[path] = []
@@ -48,6 +49,10 @@ class Blueprint:
             else:
                 self._path_middleware[path].append(middleware)
 
+        # Store blocking
+        if block:
+            self._path_blocking[path] = True
+
     def register_with_dispatcher(self, dispatcher):
         """Register all handlers with a dispatcher"""
         for event_type, handlers in self._event_handlers.items():
@@ -56,9 +61,10 @@ class Blueprint:
 
         for path, handlers in self._path_handlers.items():
             for handler in handlers:
-                # Get middleware for this path
+                # Get middleware and blocking for this path
                 middleware = self._path_middleware.get(path, [])
-                dispatcher.register_path(path, handler, middleware)
+                block = self._path_blocking.get(path, False)
+                dispatcher.register_path(path, handler, middleware, block)
 
     def is_connected(self, client_addr: tuple = None):
         if hasattr(self, "_client") and self._client:

{socketflow-0.1.2 → socketflow-0.1.4}/socketflow/global_side/dispatcher.py

@@ -166,7 +166,11 @@ class EventDispatcher:
             # Check if blocking is enabled for this path and we have a client ID
             lock = None
             if is_blocking and client_id:
-                lock_key = (path, client_id)
+                # Use the pattern string for parameterized paths so all dynamic
+                # paths sharing the same pattern (e.g. /slow/1, /slow/2 for
+                # /slow/<id>) share one lock per client.
+                lock_path = matched_pattern if matched_pattern else path
+                lock_key = (lock_path, client_id)
                 # Get or create lock for this client-path combination
                 if lock_key not in self._path_locks:
                     self._path_locks[lock_key] = threading.Lock()

{socketflow-0.1.2 → 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.2 → 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:
@@ -400,8 +405,8 @@ class TcpServer:
     def event(self, event_type: str):
         return self.dispatcher.event(event_type)
 
-    def path(self, path: str, middleware=None):
-        return self.dispatcher.path(path, middleware)
+    def path(self, path: str, middleware=None, block: bool = False):
+        return self.dispatcher.path(path, middleware, block)
 
     def register_blueprint(self, blueprint):
         blueprint._server = self  # Associate blueprint with this server

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

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