bustapi 0.14.1__tar.gz → 0.14.3__tar.gz

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

@@ -2,6 +2,17 @@
 
 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
+- **Template `url_for` Availability**: `url_for` is now automatically injected into the Jinja2 template context within `render_template()`, matching Flask's built-in behaviour. Previously, `{{ url_for('endpoint') }}` would raise `'url_for' is undefined` in templates unless manually added via a context processor.
+
 ## [0.14.1] - 2026-06-17
 
 ### Fixed

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

@@ -432,7 +432,7 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "bustapi_core"
-version = "0.14.1"
+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"
@@ -992,16 +992,14 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
 dependencies = [
  "cfg-if",
  "libc",
  "r-efi 6.0.0",
  "rand_core 0.10.1",
- "wasip2",
- "wasip3",
 ]
 
 [[package]]
@@ -1039,15 +1037,6 @@ version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
-[[package]]
-name = "hashbrown"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
-dependencies = [
- "foldhash",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.17.1"
@@ -1228,12 +1217,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "id-arena"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1275,8 +1258,6 @@ checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
  "hashbrown 0.17.1",
- "serde",
- "serde_core",
 ]
 
 [[package]]
@@ -1367,12 +1348,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "leb128fmt"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
-
 [[package]]
 name = "libc"
 version = "0.2.186"
@@ -1486,9 +1461,9 @@ dependencies = [
 
 [[package]]
 name = "minijinja"
-version = "2.20.0"
+version = "2.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2929e494b2280e1e18959bb2e121da03347ae896896fdfaceaab43c88a02803f"
+checksum = "cb3d648e68cea56d9858d535ee28f9538404e2dd8cb08ed0bd05dca379477f39"
 dependencies = [
  "memo-map",
  "serde",
@@ -1702,16 +1677,6 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "prettyplease"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
-dependencies = [
- "proc-macro2",
- "syn",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.106"
@@ -1832,7 +1797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
 dependencies = [
  "chacha20",
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
  "rand_core 0.10.1",
 ]
 
@@ -2162,7 +2127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
  "once_cell",
  "rustix",
  "windows-sys 0.61.2",
@@ -2438,16 +2403,7 @@ version = "1.0.4+wasi-0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
 dependencies = [
- "wit-bindgen 0.57.1",
-]
-
-[[package]]
-name = "wasip3"
-version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
-dependencies = [
- "wit-bindgen 0.51.0",
+ "wit-bindgen",
 ]
 
 [[package]]
@@ -2495,40 +2451,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "wasm-encoder"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
-dependencies = [
- "leb128fmt",
- "wasmparser",
-]
-
-[[package]]
-name = "wasm-metadata"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
-dependencies = [
- "anyhow",
- "indexmap",
- "wasm-encoder",
- "wasmparser",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
-dependencies = [
- "bitflags",
- "hashbrown 0.15.5",
- "indexmap",
- "semver",
-]
-
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
@@ -2762,100 +2684,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
-[[package]]
-name = "wit-bindgen"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
-dependencies = [
- "wit-bindgen-rust-macro",
-]
-
 [[package]]
 name = "wit-bindgen"
 version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
-[[package]]
-name = "wit-bindgen-core"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
-dependencies = [
- "anyhow",
- "heck",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-bindgen-rust"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
-dependencies = [
- "anyhow",
- "heck",
- "indexmap",
- "prettyplease",
- "syn",
- "wasm-metadata",
- "wit-bindgen-core",
- "wit-component",
-]
-
-[[package]]
-name = "wit-bindgen-rust-macro"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
-dependencies = [
- "anyhow",
- "prettyplease",
- "proc-macro2",
- "quote",
- "syn",
- "wit-bindgen-core",
- "wit-bindgen-rust",
-]
-
-[[package]]
-name = "wit-component"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
-dependencies = [
- "anyhow",
- "bitflags",
- "indexmap",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "wasm-encoder",
- "wasm-metadata",
- "wasmparser",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap",
- "log",
- "semver",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser",
-]
-
 [[package]]
 name = "writeable"
 version = "0.6.3"

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

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

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

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

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

@@ -2,6 +2,17 @@
 
 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
+- **Template `url_for` Availability**: `url_for` is now automatically injected into the Jinja2 template context within `render_template()`, matching Flask's built-in behaviour. Previously, `{{ url_for('endpoint') }}` would raise `'url_for' is undefined` in templates unless manually added via a context processor.
+
 ## [0.14.1] - 2026-06-17
 
 ### Fixed

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

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

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

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

{bustapi-0.14.1 → bustapi-0.14.3}/python/bustapi/app.py

@@ -82,7 +82,9 @@ class BustAPI(
         self.teardown_request_funcs: List[Callable] = []
         self.teardown_appcontext_funcs: List[Callable] = []
         self.blueprints: Dict[str, Blueprint] = {}
-        self.url_map: Dict[str, Dict] = {}
+        from .routing.decorators import Map
+
+        self.url_map = Map()
         self._url_rules: List[Dict[str, Any]] = []
         self.path_validators: Dict[tuple, Dict[str, Any]] = {}
         self.query_validators: Dict[tuple, Dict[str, tuple]] = {}
@@ -237,13 +239,42 @@ class BustAPI(
 
     def _dispatch_not_found(self, rust_request, params=None):
         from .core.exceptions import NotFound
+        from .utils import async_to_sync
 
         try:
             request = Request._from_rust_request(rust_request)
             request.app = self
             token = _request_ctx.set(request)
             try:
+                session = None
+                if self.secret_key:
+                    session = self.session_interface.open_session(self, request)
+                    request.session = session
+
+                bp = (
+                    self.blueprints.get(request.blueprint)
+                    if request.blueprint
+                    else None
+                )
+                before_funcs = (
+                    bp.before_request_funcs if bp else []
+                ) + self.before_request_funcs
+                if before_funcs:
+                    for before_func in before_funcs:
+                        res = before_func()
+                        if inspect.isawaitable(res):
+                            res = async_to_sync(res)
+                        if res is not None:
+                            response = self._make_response(res)
+                            if session:
+                                self.session_interface.save_session(
+                                    self, session, response
+                                )
+                            return self._response_to_rust_format(response)
+
                 response = self._handle_exception(NotFound())
+                if session is not None:
+                    self.session_interface.save_session(self, session, response)
                 return self._response_to_rust_format(response)
             finally:
                 _request_ctx.reset(token)

{bustapi-0.14.1 → bustapi-0.14.3}/python/bustapi/core/helpers.py

@@ -356,6 +356,8 @@ def render_template(template_name: str, **context) -> Response:
                 context["current_app"] = _current_app
             except RuntimeError:
                 pass
+        if "url_for" not in context:
+            context["url_for"] = url_for
 
         # Run template context processors
         try:

{bustapi-0.14.1 → bustapi-0.14.3}/python/bustapi/routing/decorators.py

@@ -7,6 +7,46 @@ import re
 from typing import Any, Callable, Optional
 
 
+class Map:
+    """
+    Flask-compatible url_map class to store and iterate rules.
+    Allows multiple rules for the same path pattern (e.g. GET and POST on same path).
+    """
+
+    def __init__(self):
+        self._rules = []
+
+    def __setitem__(self, key, value):
+        self._rules.append((key, value))
+
+    def items(self):
+        return self._rules
+
+    def __iter__(self):
+        return iter(r for r, _ in self._rules)
+
+    def __contains__(self, key):
+        return any(r == key for r, _ in self._rules)
+
+    def __getitem__(self, key):
+        for r, val in reversed(self._rules):
+            if r == key:
+                return val
+        raise KeyError(key)
+
+    def get(self, key, default=None):
+        try:
+            return self[key]
+        except KeyError:
+            return default
+
+    def clear(self):
+        self._rules.clear()
+
+    def __len__(self):
+        return len(self._rules)
+
+
 class RouteRegistration:
     """Mixin providing Flask-compatible route decorators."""
 

{bustapi-0.14.1 → 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.1 → 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;
                 }
                 _ => {

{bustapi-0.14.1 → bustapi-0.14.3}/tests/test_issue_29.py

@@ -117,3 +117,52 @@ def test_blueprint_advanced_features():
         res = client.get("/trigger_401")
         assert res.status_code == 401
         assert res.json["error"] == "app_401"
+
+
+def test_blueprint_multiple_methods_for_same_rule():
+    app = BustAPI()
+    app.secret_key = "test-secret-key"
+
+    unblocked_routes = ["/auth/login"]
+
+    @app.before_request
+    def login_before_visit():
+        from bustapi import redirect, request, session
+
+        if not (
+            "user_id" in session
+            or request.path in unblocked_routes
+            or request.path.startswith("/static")
+        ):
+            session["came_from"] = request.path
+            return redirect(url_for("auth.login"))
+
+    auth = Blueprint("auth", __name__, url_prefix="/auth")
+
+    @auth.get("/login", endpoint="login")
+    def login_get():
+        return "GET Login Page"
+
+    @auth.post("/login")
+    def login_post():
+        return "POST Login Page"
+
+    app.register_blueprint(auth)
+
+    from bustapi.testing import BustTestClient
+
+    with BustTestClient(app) as client:
+        # GET / should redirect to /auth/login
+        res = client.get("/")
+        assert res.status_code == 302
+        assert res.headers["Location"] == "/auth/login"
+
+        # GET /auth/login should load fine (200)
+        res_login_get = client.get("/auth/login")
+        assert res_login_get.status_code == 200
+        assert res_login_get.get_data(as_text=True) == "GET Login Page"
+
+        # POST /auth/login should load fine (200)
+        res_login_post = client.post("/auth/login")
+        assert res_login_post.status_code == 200
+        assert res_login_post.get_data(as_text=True) == "POST Login Page"