flet-web 0.70.0.dev5320__py3-none-any.whl → 0.70.0.dev5361__py3-none-any.whl

flet_web/fastapi/flet_app.py

@@ -11,8 +11,8 @@ from typing import Any, Optional
 import msgpack
 from fastapi import WebSocket, WebSocketDisconnect
 from flet.controls.base_control import BaseControl
+from flet.controls.context import _context_page
 from flet.controls.exceptions import FletPageDisconnectedException
-from flet.controls.page import _session_page
 from flet.controls.update_behavior import UpdateBehavior
 from flet.messaging.connection import Connection
 from flet.messaging.protocol import (
@@ -139,7 +139,7 @@ class FletApp(Connection):
         logger.info(f"Start session: {self.__session.id}")
         try:
             assert self.__main is not None
-            _session_page.set(self.__session.page)
+            _context_page.set(self.__session.page)
             UpdateBehavior.reset()
 
             if asyncio.iscoroutinefunction(self.__main):
@@ -255,6 +255,11 @@ class FletApp(Connection):
             self.__session.apply_page_patch(req.page)
 
             if new_session:
+                # update IP and user-agent
+                self.__session.page.client_ip = self.client_ip
+                self.__session.page.client_user_agent = self.client_user_agent
+
+                # run before_main
                 if asyncio.iscoroutinefunction(self.__before_main):
                     await self.__before_main(self.__session.page)
                 elif callable(self.__before_main):

flet_web/fastapi/flet_fastapi.py

@@ -1,20 +1,17 @@
 import asyncio
-from contextlib import asynccontextmanager
+from collections.abc import Awaitable, Coroutine, Sequence
+from contextlib import asynccontextmanager, suppress
 from typing import (
     Any,
-    Awaitable,
     Callable,
-    Coroutine,
     Dict,
     List,
     Optional,
-    Sequence,
     Type,
     Union,
 )
 
 import fastapi
-import flet_web.fastapi
 from fastapi.datastructures import Default
 from fastapi.params import Depends
 from fastapi.utils import generate_unique_id
@@ -23,6 +20,8 @@ from starlette.requests import Request
 from starlette.responses import JSONResponse, Response
 from starlette.routing import BaseRoute
 
+import flet_web.fastapi
+
 
 class FastAPI(fastapi.FastAPI):
     def __init__(
@@ -80,7 +79,8 @@ class FastAPI(fastapi.FastAPI):
                     else:
                         h()
 
-            yield
+            with suppress(asyncio.CancelledError):
+                yield
             if on_shutdown:
                 for h in on_shutdown:
                     if asyncio.iscoroutinefunction(h):

flet_web/fastapi/serve_fastapi_web_app.py

@@ -12,9 +12,12 @@ logger = logging.getLogger(flet_fastapi.__name__)
 
 
 class WebServerHandle:
-    def __init__(self, page_url: str, server: uvicorn.Server) -> None:
+    def __init__(
+        self, page_url: str, server: uvicorn.Server, serve_task: asyncio.Task
+    ) -> None:
         self.page_url = page_url
         self.server = server
+        self.serve_task = serve_task
 
     async def close(self):
         logger.info("Closing Flet web server...")
@@ -61,10 +64,9 @@ async def serve_fastapi_web_app(
     web_renderer: WebRenderer = WebRenderer.AUTO,
     route_url_strategy: RouteUrlStrategy = RouteUrlStrategy.PATH,
     no_cdn: bool = False,
-    blocking: bool = False,
     on_startup: Optional[Any] = None,
     log_level: Optional[Union[str, int]] = None,
-):
+) -> WebServerHandle:
     web_path = f"/{page_name.strip('/')}"
     page_url = f"http://{url_host}:{port}{web_path if web_path != '/' else ''}"
 
@@ -91,9 +93,6 @@ async def serve_fastapi_web_app(
     )
     server = uvicorn.Server(config)
 
-    if blocking:
-        await server.serve()
-    else:
-        asyncio.create_task(server.serve())
-
-    return WebServerHandle(page_url=page_url, server=server)
+    return WebServerHandle(
+        page_url=page_url, server=server, serve_task=asyncio.create_task(server.serve())
+    )

flet_web/version.py

@@ -1 +1 @@
-version = "0.70.0.dev5320"
+version = "0.70.0.dev5361"

flet_web/web/flutter_bootstrap.js

@@ -54,7 +54,7 @@ if (flet.noCdn) {
 _flutter.loader.load({
     config: flutterConfig,
     serviceWorkerSettings: {
-        serviceWorkerVersion: "3435973883",
+        serviceWorkerVersion: "2638200543",
     },
     onEntrypointLoaded: async function (engineInitializer) {
         loading.classList.add('main_done');

flet_web/web/flutter_service_worker.js

@@ -3,7 +3,7 @@ const MANIFEST = 'flutter-app-manifest';
 const TEMP = 'flutter-temp-cache';
 const CACHE_NAME = 'flutter-app-cache';
 
-const RESOURCES = {"main.dart.js": "9b4d973422ea880f90bbbe808438fc42",
+const RESOURCES = {"main.dart.js": "9124a0753f364dd1c56c25b99f1858e5",
 "manifest.json": "58765f937ba0d0c40a3a714c5c1adb87",
 "python-worker.js": "26eb131f3acb5ce232fea72da957e8ce",
 "canvaskit/skwasm.wasm": "39dd80367a4e71582d234948adc521c0",
@@ -15,8 +15,8 @@ const RESOURCES = {"main.dart.js": "9b4d973422ea880f90bbbe808438fc42",
 "canvaskit/skwasm.js.symbols": "e72c79950c8a8483d826a7f0560573a1",
 "canvaskit/canvaskit.js": "728b2d477d9b8c14593d4f9b82b484f3",
 "canvaskit/canvaskit.wasm": "7a3f4ae7d65fc1de6a6e7ddd3224bc93",
-"flutter_bootstrap.js": "711351ed1ddf90117c42152a2a310eef",
-"main.dart.wasm": "297629a19d2545ed9cbf4854b6e98b11",
+"flutter_bootstrap.js": "75b007d3d4b16e13513cee9d21d4608d",
+"main.dart.wasm": "c5171795a7d5724e44f823873fb82c5c",
 "favicon.png": "302ac04c14db027d016d1fe74c6a80a0",
 "flutter.js": "83d881c1dbb6d6bcd6b42e274605b69c",
 "index.html": "55e4a5140b3c5f98b694331a15299630",
@@ -41,7 +41,7 @@ const RESOURCES = {"main.dart.js": "9b4d973422ea880f90bbbe808438fc42",
 "icons/icon-maskable-192.png": "c1c2210feeb444cf800a5ce0d06eff16",
 "icons/loading-animation.png": "41a96047dbd2463a50c46ad3bf6ff158",
 "icons/icon-maskable-512.png": "aa798e6d780ff109da17c3a98d5f2619",
-"main.dart.mjs": "2faf19d0a5e56ac94677e62b1dabcbf8",
+"main.dart.mjs": "44b4c76f7cb2aea74da37ee8aa60446c",
 "python.js": "352c5261eadd3cc73ac082984266c0fc",
 "version.json": "3fea9d9c7b4ca6955aa03e762e0d2e13"};
 // The application shell files that are downloaded before a service worker can