bustapi 0.14.2__tar.gz → 0.14.3__tar.gz

{bustapi-0.14.2 → bustapi-0.14.3}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented here.
 
+## [0.14.3] - 2026-06-19
+
+### Fixed
+- **WebSocket Handshake**: Fixed a bug where client-initiated close frames (e.g. `socket.close()` in JS) were not properly echoed back by the Rust backend to complete the WebSocket close handshake. `on_disconnect` and `on_binary` handlers are now fully thread-safe and trigger cleanly.
+- **WebSocket Config**: Clarified the usage of `WebSocketConfig` instance for the `config` parameter in WebSocket routes.
+
 ## [0.14.2] - 2026-06-18
 
 ### Fixed

{bustapi-0.14.2 → bustapi-0.14.3}/Cargo.lock

@@ -432,7 +432,7 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "bustapi_core"
-version = "0.14.2"
+version = "0.14.3"
 dependencies = [
  "actix-files",
  "actix-http",
@@ -476,9 +476,9 @@ dependencies = [
 
 [[package]]
 name = "bytes"
-version = "1.11.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593"
 
 [[package]]
 name = "bytestring"

{bustapi-0.14.2 → bustapi-0.14.3}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bustapi_core"
-version = "0.14.2"
+version = "0.14.3"
 edition = "2021"
 readme = "README.md"
 

{bustapi-0.14.2 → bustapi-0.14.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bustapi
-Version: 0.14.2
+Version: 0.14.3
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{bustapi-0.14.2 → bustapi-0.14.3}/docs/changelog.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented here.
 
+## [0.14.3] - 2026-06-19
+
+### Fixed
+- **WebSocket Handshake**: Fixed a bug where client-initiated close frames (e.g. `socket.close()` in JS) were not properly echoed back by the Rust backend to complete the WebSocket close handshake. `on_disconnect` and `on_binary` handlers are now fully thread-safe and trigger cleanly.
+- **WebSocket Config**: Clarified the usage of `WebSocketConfig` instance for the `config` parameter in WebSocket routes.
+
 ## [0.14.2] - 2026-06-18
 
 ### Fixed

{bustapi-0.14.2 → bustapi-0.14.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "bustapi"
-version = "0.14.2"
+version = "0.14.3"
 description = "High-performance Python web framework with Rust backend"
 authors = [
     {name = "GrandpaEJ", email = ""}

{bustapi-0.14.2 → bustapi-0.14.3}/python/bustapi/__init__.py

@@ -22,7 +22,7 @@ import platform
 import sys
 from http import HTTPStatus
 
-__version__ = "0.14.2"
+__version__ = "0.14.3"
 __author__ = "BustAPI"  # with GrandpaEJ
 __email__ = ""
 

{bustapi-0.14.2 → bustapi-0.14.3}/python/bustapi/websocket.py

@@ -197,61 +197,49 @@ class WebSocketHandler:
         if hasattr(task, "add_done_callback"):
             task.add_done_callback(_task_done_callback)
 
+    def _get_loop(self, session_id: int):
+        """Find the asyncio loop associated with a session."""
+        if hasattr(self, "_background_loop") and self._background_loop:
+            return self._background_loop
+        task = self._tasks.get(session_id)
+        if task:
+            try:
+                return task.get_loop()
+            except Exception:
+                pass
+        return None
+
     def on_message(self, session_id: int, message: str) -> None:
         """Called when a text message is received."""
         if session_id in self._connections:
             ws = self._connections[session_id]
-            # Since we might be running in a different thread (Actix thread)
-            # than the WebSocket's loop (Background thread), we must use thread-safe scheduling.
-            # We need to find the loop associated with this WebSocket's handler.
-            loop = None
-            if hasattr(self, "_background_loop") and self._background_loop:
-                loop = self._background_loop
-            else:
-                # Fallback: try to get loop from registered task?
-                pass
-
+            loop = self._get_loop(session_id)
             if loop:
                 loop.call_soon_threadsafe(ws._receive_message, message)
             else:
-                # If no specific background loop, imply we are reusing the main loop?
-                # But if we are in Actix thread, main loop might be running in main thread.
-                # call_soon_threadsafe is safe to call from any thread to target loop.
-                # However, if we don't have 'loop' var ...
-                # ws._messages is bound to a loop. We should get it.
-                # asyncio.Queue doesn't expose public ._loop, but we can try to guess.
-                # Actually, check self._tasks[session_id].get_loop() if available py3.7+
-                task = self._tasks.get(session_id)
-                if task:
-                    try:
-                        loop = task.get_loop()
-                        loop.call_soon_threadsafe(ws._receive_message, message)
-                        return
-                    except:
-                        pass
-
-                # Fallback to direct call if we can't find loop (risk of race)
                 ws._receive_message(message)
 
-        return None
-
     def on_binary(self, session_id: int, data: bytes) -> None:
         """Called when binary data is received."""
         if session_id in self._connections:
             ws = self._connections[session_id]
-            # Convert if necessary, but data should come as bytes/list from bindings
-            # If bindings use Vec<u8> -> list[int] in Python usually?
-            # Or bytes?
-            # Let's assume bytes for now or cast.
             if isinstance(data, list):
                 data = bytes(data)
-            ws._receive_message(data)
+            loop = self._get_loop(session_id)
+            if loop:
+                loop.call_soon_threadsafe(ws._receive_message, data)
+            else:
+                ws._receive_message(data)
 
     def on_disconnect(self, session_id: int, reason: Optional[str] = None) -> None:
         """Called when a client disconnects."""
         if session_id in self._connections:
             ws = self._connections[session_id]
-            ws._receive_close(reason)
+            loop = self._get_loop(session_id)
+            if loop:
+                loop.call_soon_threadsafe(ws._receive_close, reason)
+            else:
+                ws._receive_close(reason)
             del self._connections[session_id]
 
         self._cleanup_task(session_id)

{bustapi-0.14.2 → bustapi-0.14.3}/src/websocket/session.rs

@@ -214,12 +214,14 @@ pub async fn handle_websocket(
                 }
                 Message::Close(reason) => {
                     let sid = ws_session.id;
-                    let reason_str = reason.map(|r| r.description.unwrap_or_default());
+                    let reason_str = reason.as_ref().and_then(|r| r.description.clone());
                     let handler_ref = Python::attach(|py| handler_for_messages.clone_ref(py));
 
                     Python::attach(|py| {
                         let _ = handler_ref.call_method1(py, "on_disconnect", (sid, reason_str));
                     });
+
+                    let _ = session.close(reason).await;
                     break;
                 }
                 _ => {