flet-web 0.70.0.dev5776__py3-none-any.whl → 0.70.0.dev5835__py3-none-any.whl

flet_web/fastapi/flet_app.py

@@ -108,8 +108,10 @@ class FletApp(Connection):
         """
         self.__websocket = websocket
 
-        self.client_ip = self.__websocket.client.host if self.__websocket.client else ""
-        self.client_user_agent = self.__websocket.headers.get("user-agent", "")
+        self.__client_ip = (
+            self.__websocket.client.host if self.__websocket.client else ""
+        )
+        self.__client_user_agent = self.__websocket.headers.get("user-agent", "")
         self.__oauth_state_id = self.__websocket.cookies.get("flet_oauth_state")
 
         self.pubsubhub = app_manager.get_pubsubhub(self.__main, loop=self.loop)
@@ -245,6 +247,8 @@ class FletApp(Connection):
                     self.__session,
                 )
 
+            _context_page.set(self.__session.page)
+
             original_route = self.__session.page.route
 
             # apply page patch
@@ -252,8 +256,8 @@ class FletApp(Connection):
 
             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
+                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):
@@ -267,7 +271,9 @@ class FletApp(Connection):
                     ClientAction.REGISTER_CLIENT,
                     RegisterClientResponseBody(
                         session_id=self.__session.id,
-                        page_patch=self.__session.get_page_patch(),
+                        page_patch=self.__session.get_page_patch()
+                        if new_session
+                        else self.__session.page,
                         error="",
                     ),
                 )
@@ -285,7 +291,11 @@ class FletApp(Connection):
                     self.__session.page.route
                     and self.__session.page.route != original_route
                 ):
-                    self.__session.page.go(self.__session.page.route)
+                    asyncio.create_task(
+                        self.__session.page._trigger_event(
+                            "route_change", {"route": self.__session.page.route}
+                        )
+                    )
 
                 if oauth_state:
                     await self.__session.page._authorize_callback(
@@ -352,10 +362,10 @@ class FletApp(Connection):
         app_manager.store_state(state_id, state)
 
     def __get_unique_session_id(self, session_id: str):
-        ip = self.client_ip
+        ip = self.__client_ip
         if ip in ["127.0.0.1", "::1"]:
             ip = ""
-        client_hash = sha1(f"{ip}{self.client_user_agent}")
+        client_hash = sha1(f"{ip}{self.__client_user_agent}")
         return f"{self.page_name}_{session_id}_{client_hash}"
 
     def dispose(self):

flet_web/version.py

@@ -1 +1 @@
-version = "0.70.0.dev5776"
+version = "0.70.0.dev5835"

flet_web/web/flutter_bootstrap.js

@@ -41,6 +41,7 @@ var loading = document.querySelector('#loading');
 
 var flutterConfig = {
     multiViewEnabled: flet.multiView,
+    entrypointBaseUrl: flet.entrypointBaseUrl,
     assetBase: flet.assetBase
 };
 if (flet.webRenderer != "auto") {
@@ -54,7 +55,7 @@ if (flet.noCdn) {
 _flutter.loader.load({
     config: flutterConfig,
     serviceWorkerSettings: {
-        serviceWorkerVersion: "2339545788",
+        serviceWorkerVersion: "2587571274",
     },
     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": "db9c2090cbd65ede2d95814891ce99f5",
+const RESOURCES = {"main.dart.js": "41c16ba829d60c5447952dd3d694ab77",
 "manifest.json": "58765f937ba0d0c40a3a714c5c1adb87",
 "python-worker.js": "26eb131f3acb5ce232fea72da957e8ce",
 "canvaskit/skwasm_heavy.js": "413f5b2b2d9345f37de148e2544f584f",
@@ -18,12 +18,12 @@ const RESOURCES = {"main.dart.js": "db9c2090cbd65ede2d95814891ce99f5",
 "canvaskit/skwasm_heavy.js.symbols": "3c01ec03b5de6d62c34e17014d1decd3",
 "canvaskit/canvaskit.js": "140ccb7d34d0a55065fbd422b843add6",
 "canvaskit/canvaskit.wasm": "07b9f5853202304d3b0749d9306573cc",
-"flutter_bootstrap.js": "b144c8547cf140825ca18028e93e11c4",
-"main.dart.wasm": "a7e3bf28273bb1dcb4b85f52cb60acbe",
+"flutter_bootstrap.js": "33f63e026daf822b01980b773dbd6f11",
+"main.dart.wasm": "9da3a888a947cf8a0dd83613ead5effc",
 "favicon.png": "302ac04c14db027d016d1fe74c6a80a0",
 "flutter.js": "888483df48293866f9f41d3d9274a779",
-"index.html": "55e4a5140b3c5f98b694331a15299630",
-"/": "55e4a5140b3c5f98b694331a15299630",
+"index.html": "ef8ce124e30a3987c3fc065be6e27e66",
+"/": "ef8ce124e30a3987c3fc065be6e27e66",
 "assets/AssetManifest.bin": "f82f600d0e9342f1147569932bdc3212",
 "assets/packages/wakelock_plus/assets/no_sleep.js": "7748a45cd593f33280669b29c2c8919a",
 "assets/packages/flutter_map/lib/assets/flutter_map_logo.png": "208d63cc917af9713fc9572bd5c09362",
@@ -45,7 +45,7 @@ const RESOURCES = {"main.dart.js": "db9c2090cbd65ede2d95814891ce99f5",
 "icons/loading-animation.png": "41a96047dbd2463a50c46ad3bf6ff158",
 "icons/icon-maskable-512.png": "aa798e6d780ff109da17c3a98d5f2619",
 "main.dart.mjs": "9f9a504ece701b6321231050e6fc8676",
-"python.js": "352c5261eadd3cc73ac082984266c0fc",
+"python.js": "3b891fa2b956f791f9670494f43b9042",
 "version.json": "3fea9d9c7b4ca6955aa03e762e0d2e13"};
 // The application shell files that are downloaded before a service worker can
 // start.

flet_web/web/index.html

@@ -26,6 +26,7 @@
       multiView: false,
       noCdn: false,
       webSocketEndpoint: "/ws",
+      entrypointBaseUrl: "/",
       assetBase: "/",
       routeUrlStrategy: "path",
       canvasKitBaseUrl: "/canvaskit/",
@@ -45,7 +46,7 @@
         console.log(flutterApp.addView({
           hostElement: document.querySelector('#view-1'),
           initialData: {
-            greeting: 'Hello, world!',
+            script: 'print("Hello from view 1")',
             randomValue: Math.floor(Math.random() * 100),
           },
           viewConstraints: {
@@ -58,6 +59,7 @@
         console.log(flutterApp.addView({
           hostElement: document.querySelector('#view-2'),
           initialData: {
+            script: 'print("Hello from view 2")',
             bar: "baz"
           },
           viewConstraints: {