uhttp-server 2.3.2__tar.gz → 2.3.4__tar.gz

{uhttp_server-2.3.2 → uhttp_server-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uhttp-server
-Version: 2.3.2
+Version: 2.3.4
 Summary: Micro HTTP server for Python and MicroPython
 Author-email: Pavel Revak <pavelrevak@gmail.com>
 License: MIT
@@ -480,6 +480,8 @@ Parameters:
 
 uHTTP supports WebSocket connections (RFC 6455) in both event mode and non-event mode.
 
+**Important:** When using `process_events()` with external select loop, `event_mode=True` is required for WebSocket support.
+
 ### Event Mode (non-blocking, multiple connections)
 
 ```python
@@ -504,17 +506,20 @@ while True:
         client.respond({'status': 'ok'})
 
     elif client.event == EVENT_WS_MESSAGE:
-        # str for text frames, bytes for binary frames
-        client.ws_send(client.ws_message)  # echo
+        data = client.read_buffer()  # bytes
+        if client.ws_is_text:
+            client.ws_send(data.decode('utf-8'))  # echo as text
+        else:
+            client.ws_send(data)  # echo as binary
 
     elif client.event == EVENT_WS_CHUNK_FIRST:
-        client.context = {'chunks': [client.ws_message]}
+        client.context = {'chunks': [client.read_buffer()]}
 
     elif client.event == EVENT_WS_CHUNK_NEXT:
-        client.context['chunks'].append(client.ws_message)
+        client.context['chunks'].append(client.read_buffer())
 
     elif client.event == EVENT_WS_CHUNK_LAST:
-        client.context['chunks'].append(client.ws_message)
+        client.context['chunks'].append(client.read_buffer())
         # process all chunks...
         client.ws_send('received')
 
@@ -549,10 +554,12 @@ while True:
 **HttpConnection properties:**
 - `is_websocket_request` - True if request is a WebSocket upgrade
 - `is_websocket` - True if connection is in WebSocket mode
-- `ws_message` - Last received message (str for text, bytes for binary)
+- `ws_is_text` - True if current message is text frame (vs binary)
+- `ws_message` - Ping/close payload (only for `EVENT_WS_PING` and `EVENT_WS_CLOSE`)
 
 **HttpConnection methods (event mode):**
 - `accept_websocket()` - Accept upgrade, switch to WebSocket mode
+- `read_buffer()` - Read message data (returns bytes, use `ws_is_text` to check type)
 - `ws_send(data)` - Send message (str → text frame, bytes → binary frame)
 - `ws_ping(data=b'')` - Send ping frame
 - `ws_close(code=1000, reason='')` - Close WebSocket connection
@@ -566,7 +573,7 @@ while True:
 
 ### Large Message Chunking
 
-Messages larger than `MAX_WS_MESSAGE_LENGTH` (default 64KB, configurable via `max_ws_message_length` kwarg) are delivered in chunks via `EVENT_WS_CHUNK_FIRST`, `EVENT_WS_CHUNK_NEXT`, `EVENT_WS_CHUNK_LAST` events. All chunk events contain data in `ws_message`.
+Messages larger than `MAX_WS_MESSAGE_LENGTH` (default 64KB, configurable via `max_ws_message_length` kwarg) are delivered in chunks via `EVENT_WS_CHUNK_FIRST`, `EVENT_WS_CHUNK_NEXT`, `EVENT_WS_CHUNK_LAST` events. Read chunk data with `read_buffer()`, check frame type with `ws_is_text`.
 
 In non-event mode, messages exceeding the limit close the connection with status 1009.
 

{uhttp_server-2.3.2 → uhttp_server-2.3.4}/README.md

@@ -463,6 +463,8 @@ Parameters:
 
 uHTTP supports WebSocket connections (RFC 6455) in both event mode and non-event mode.
 
+**Important:** When using `process_events()` with external select loop, `event_mode=True` is required for WebSocket support.
+
 ### Event Mode (non-blocking, multiple connections)
 
 ```python
@@ -487,17 +489,20 @@ while True:
         client.respond({'status': 'ok'})
 
     elif client.event == EVENT_WS_MESSAGE:
-        # str for text frames, bytes for binary frames
-        client.ws_send(client.ws_message)  # echo
+        data = client.read_buffer()  # bytes
+        if client.ws_is_text:
+            client.ws_send(data.decode('utf-8'))  # echo as text
+        else:
+            client.ws_send(data)  # echo as binary
 
     elif client.event == EVENT_WS_CHUNK_FIRST:
-        client.context = {'chunks': [client.ws_message]}
+        client.context = {'chunks': [client.read_buffer()]}
 
     elif client.event == EVENT_WS_CHUNK_NEXT:
-        client.context['chunks'].append(client.ws_message)
+        client.context['chunks'].append(client.read_buffer())
 
     elif client.event == EVENT_WS_CHUNK_LAST:
-        client.context['chunks'].append(client.ws_message)
+        client.context['chunks'].append(client.read_buffer())
         # process all chunks...
         client.ws_send('received')
 
@@ -532,10 +537,12 @@ while True:
 **HttpConnection properties:**
 - `is_websocket_request` - True if request is a WebSocket upgrade
 - `is_websocket` - True if connection is in WebSocket mode
-- `ws_message` - Last received message (str for text, bytes for binary)
+- `ws_is_text` - True if current message is text frame (vs binary)
+- `ws_message` - Ping/close payload (only for `EVENT_WS_PING` and `EVENT_WS_CLOSE`)
 
 **HttpConnection methods (event mode):**
 - `accept_websocket()` - Accept upgrade, switch to WebSocket mode
+- `read_buffer()` - Read message data (returns bytes, use `ws_is_text` to check type)
 - `ws_send(data)` - Send message (str → text frame, bytes → binary frame)
 - `ws_ping(data=b'')` - Send ping frame
 - `ws_close(code=1000, reason='')` - Close WebSocket connection
@@ -549,7 +556,7 @@ while True:
 
 ### Large Message Chunking
 
-Messages larger than `MAX_WS_MESSAGE_LENGTH` (default 64KB, configurable via `max_ws_message_length` kwarg) are delivered in chunks via `EVENT_WS_CHUNK_FIRST`, `EVENT_WS_CHUNK_NEXT`, `EVENT_WS_CHUNK_LAST` events. All chunk events contain data in `ws_message`.
+Messages larger than `MAX_WS_MESSAGE_LENGTH` (default 64KB, configurable via `max_ws_message_length` kwarg) are delivered in chunks via `EVENT_WS_CHUNK_FIRST`, `EVENT_WS_CHUNK_NEXT`, `EVENT_WS_CHUNK_LAST` events. Read chunk data with `read_buffer()`, check frame type with `ws_is_text`.
 
 In non-event mode, messages exceeding the limit close the connection with status 1009.
 

{uhttp_server-2.3.2 → uhttp_server-2.3.4}/tests/test_keepalive_simple.py

@@ -58,7 +58,7 @@ class TestKeepAliveSimple(unittest.TestCase):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         try:
             sock.connect(('localhost', self.PORT))
-            sock.settimeout(0.5)
+            sock.settimeout(2.0)
 
             responses = []
 
@@ -119,7 +119,7 @@ class TestKeepAliveSimple(unittest.TestCase):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         try:
             sock.connect(('localhost', self.PORT))
-            sock.settimeout(0.5)
+            sock.settimeout(2.0)
 
             request = b"GET /test HTTP/1.1\r\nHost: localhost\r\n\r\n"
             sock.send(request)
@@ -167,7 +167,7 @@ class TestKeepAliveSimple(unittest.TestCase):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         try:
             sock.connect(('localhost', self.PORT))
-            sock.settimeout(0.5)
+            sock.settimeout(2.0)
 
             request = b"GET /test HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n"
             sock.send(request)
@@ -197,7 +197,7 @@ class TestKeepAliveSimple(unittest.TestCase):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         try:
             sock.connect(('localhost', self.PORT))
-            sock.settimeout(0.5)
+            sock.settimeout(2.0)
 
             request_numbers = []
 

{uhttp_server-2.3.2 → uhttp_server-2.3.4}/uhttp/server.py

@@ -128,6 +128,7 @@ STATUS_CODES = {
     405: "Method Not Allowed",
     406: "Not Acceptable",
     408: "Request Timeout",
+    409: "Conflict",
     410: "Gone",
     411: "Length Required",
     413: "Payload Too Large",
@@ -781,7 +782,10 @@ class HttpConnection(_WsFrameMixin):
 
     @property
     def data(self):
-        """Content data"""
+        """Content data (parsed JSON/form or raw bytes)"""
+        # Lazy parse buffer on EVENT_COMPLETE (after accept_body)
+        if self._data is None and self._event == EVENT_COMPLETE and self._buffer:
+            self._process_data()
         return self._data
 
     @property

{uhttp_server-2.3.2 → uhttp_server-2.3.4}/uhttp_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uhttp-server
-Version: 2.3.2
+Version: 2.3.4
 Summary: Micro HTTP server for Python and MicroPython
 Author-email: Pavel Revak <pavelrevak@gmail.com>
 License: MIT
@@ -480,6 +480,8 @@ Parameters:
 
 uHTTP supports WebSocket connections (RFC 6455) in both event mode and non-event mode.
 
+**Important:** When using `process_events()` with external select loop, `event_mode=True` is required for WebSocket support.
+
 ### Event Mode (non-blocking, multiple connections)
 
 ```python
@@ -504,17 +506,20 @@ while True:
         client.respond({'status': 'ok'})
 
     elif client.event == EVENT_WS_MESSAGE:
-        # str for text frames, bytes for binary frames
-        client.ws_send(client.ws_message)  # echo
+        data = client.read_buffer()  # bytes
+        if client.ws_is_text:
+            client.ws_send(data.decode('utf-8'))  # echo as text
+        else:
+            client.ws_send(data)  # echo as binary
 
     elif client.event == EVENT_WS_CHUNK_FIRST:
-        client.context = {'chunks': [client.ws_message]}
+        client.context = {'chunks': [client.read_buffer()]}
 
     elif client.event == EVENT_WS_CHUNK_NEXT:
-        client.context['chunks'].append(client.ws_message)
+        client.context['chunks'].append(client.read_buffer())
 
     elif client.event == EVENT_WS_CHUNK_LAST:
-        client.context['chunks'].append(client.ws_message)
+        client.context['chunks'].append(client.read_buffer())
         # process all chunks...
         client.ws_send('received')
 
@@ -549,10 +554,12 @@ while True:
 **HttpConnection properties:**
 - `is_websocket_request` - True if request is a WebSocket upgrade
 - `is_websocket` - True if connection is in WebSocket mode
-- `ws_message` - Last received message (str for text, bytes for binary)
+- `ws_is_text` - True if current message is text frame (vs binary)
+- `ws_message` - Ping/close payload (only for `EVENT_WS_PING` and `EVENT_WS_CLOSE`)
 
 **HttpConnection methods (event mode):**
 - `accept_websocket()` - Accept upgrade, switch to WebSocket mode
+- `read_buffer()` - Read message data (returns bytes, use `ws_is_text` to check type)
 - `ws_send(data)` - Send message (str → text frame, bytes → binary frame)
 - `ws_ping(data=b'')` - Send ping frame
 - `ws_close(code=1000, reason='')` - Close WebSocket connection
@@ -566,7 +573,7 @@ while True:
 
 ### Large Message Chunking
 
-Messages larger than `MAX_WS_MESSAGE_LENGTH` (default 64KB, configurable via `max_ws_message_length` kwarg) are delivered in chunks via `EVENT_WS_CHUNK_FIRST`, `EVENT_WS_CHUNK_NEXT`, `EVENT_WS_CHUNK_LAST` events. All chunk events contain data in `ws_message`.
+Messages larger than `MAX_WS_MESSAGE_LENGTH` (default 64KB, configurable via `max_ws_message_length` kwarg) are delivered in chunks via `EVENT_WS_CHUNK_FIRST`, `EVENT_WS_CHUNK_NEXT`, `EVENT_WS_CHUNK_LAST` events. Read chunk data with `read_buffer()`, check frame type with `ws_is_text`.
 
 In non-event mode, messages exceeding the limit close the connection with status 1009.