Replace Fletd server for desktop apps with a light-weight Python shim (#838)

* WebSocket client abstracted to a protocol

* close() -> disconnect()

* ws.pageEventFromWeb() -> server.sendPageEvent()

* SocketConnection for desktop apps

* Socket server/connection prototype

* "add" command - buggy implementation

* "add" command implemented

* All commands supported

* SyncLocalSocketConnection

* Move common logic to LocalConnection

* AsyncLocalSocketConnection - prototype

* AsyncLocalSocketConnection complete

* Poetry (#867)

* Poetry files added

* Run poetry in CI

* Build with poetry

* poetry install

* New project structure with flet_core

* Break everything into 2 packages

* simplified init from flet_core

* Fix CI

* Remove beartype tests

* get rid of beartype

* All python tasks

* Patch version

* build wheels

* Fix patching

* Run all jobs

* Add "assetsDir" to a client

* support assets_dir in desktop apps

* Fix Studio build

* Fix Dart imports

* Update README.md

* Update __init__.py

* Support assets dir in `flet run`

* Fix _SyncLocalSocketConnection__uds_path error

* Update sync_local_socket_connection.py

* Support assets dir in markdown control

* Adding missing imports

* Use FLET_VIEW_PATH on Windows

* Faster scrolling with mouse wheel on Windows

Fix #872

* Fixed exception on `page.window_maximizable`

Fixed #870

* Custom port for TCP connections

* Bump file_picker to fix blocking UI thread on Windows

* Bump audioplayers to 2.0.0

* Remove fletd from installer package

* added pre-commit

* Fix pyinstaller40 entry points

* Add `flet pack` args: --onedir, multiple --add-data

Author: FeodorFitsner

.appveyor.yml

@@ -407,13 +407,13 @@ for:
     install:
       - python --version
       - cd sdk/python
-      - pip install pdm
-      - pdm install
+      - pip install poetry
+      - poetry install
 
     build: off
 
     test_script:
-      - pdm run pytest tests
+      - poetry run pytest
 
   ######################
   #    Python Build    #
@@ -425,27 +425,38 @@ for:
     install:
       - python --version
       - cd sdk/python
-      - pip install --upgrade setuptools wheel twine pdm
-      - pdm install
+      - pip install --upgrade setuptools wheel twine poetry tomlkit
+      - poetry install
 
     test: off
 
     build_script:
+      # patch version
       - ps: |
           $ErrorActionPreference = "Stop"
-          $ver = $env:APPVEYOR_BUILD_VERSION.replace("+", ".dev")
-          (Get-Content pyproject.toml).replace("version = `"0.1.0`"", "version = `"$ver`"") | Set-Content pyproject.toml
-          (Get-Content flet/version.py).replace("version = `"`"", "version = `"$ver`"") | Set-Content flet/version.py
-
-      # build package
-      - pdm build
+          $env:PYPI_VER = $env:APPVEYOR_BUILD_VERSION.replace("+", ".dev")
+          $vp = "packages/flet/src/flet/version.py"; (Get-Content $vp).replace("version = `"`"", "version = `"$env:PYPI_VER`"") | Set-Content $vp
+      - python3 patch_toml.py packages/flet/pyproject.toml $PYPI_VER
+      - python3 patch_toml.py packages/flet-core/pyproject.toml $PYPI_VER
+
+      # build "flet-core" package
+      - pushd packages/flet-core
+      - poetry build
+      - popd
+
+      # build "flet" package
+      - pushd packages/flet
+      - poetry build
       - python3 build-wheels.py
+      - popd
 
       # publish package
       - sh: |
           if [[ ("$APPVEYOR_REPO_BRANCH" == "main" || "$APPVEYOR_REPO_TAG_NAME" != "") && "$APPVEYOR_PULL_REQUEST_NUMBER" == "" ]]; then
-              twine upload dist/*
+              twine upload packages/flet-core/dist/* packages/flet/dist/*
           fi
+          
 
     artifacts:
-      path: sdk/python/dist/*
+      - path: sdk/python/packages/flet-core/dist/*
+      - path: sdk/python/packages/flet/dist/*

client/lib/main.dart

@@ -16,6 +16,7 @@ void main([List<String>? args]) async {
   await setupDesktop();
 
   var pageUrl = Uri.base.toString();
+  var assetsDir = "";
   //debugPrint("Uri.base: ${Uri.base}");
 
   if (kDebugMode) {
@@ -38,9 +39,15 @@ void main([List<String>? args]) async {
     }
     pageUrl = args[0];
     if (args.length > 1) {
-      var pidFile = await File(args[1]).create();
+      var pidFilePath = args[1];
+      debugPrint("Args contain a path to PID file: $pidFilePath}");
+      var pidFile = await File(pidFilePath).create();
       await pidFile.writeAsString("$pid");
     }
+    if (args.length > 2) {
+      assetsDir = args[2];
+      debugPrint("Args contain a path assets directory: $assetsDir}");
+    }
   }
 
   debugPrint("Page URL: $pageUrl");
@@ -61,6 +68,7 @@ void main([List<String>? args]) async {
   runApp(FletApp(
     title: 'Flet',
     pageUrl: pageUrl,
+    assetsDir: assetsDir,
     errorsHandler: errorsHandler,
   ));
 }

client/pubspec.lock

@@ -28,49 +28,49 @@ packages:
       name: audioplayers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "2.0.0"
   audioplayers_android:
     dependency: transitive
     description:
       name: audioplayers_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.4"
   audioplayers_darwin:
     dependency: transitive
     description:
       name: audioplayers_darwin
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "2.0.0"
   audioplayers_linux:
     dependency: transitive
     description:
       name: audioplayers_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.3"
   audioplayers_platform_interface:
     dependency: transitive
     description:
       name: audioplayers_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "3.0.0"
   audioplayers_web:
     dependency: transitive
     description:
       name: audioplayers_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.1"
   audioplayers_windows:
     dependency: transitive
     description:
       name: audioplayers_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -140,7 +140,7 @@ packages:
       name: file_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.1"
+    version: "5.2.5"
   flet:
     dependency: "direct main"
     description:
@@ -408,7 +408,7 @@ packages:
       name: screen_retriever
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2"
+    version: "0.1.5"
   sensors_plus:
     dependency: transitive
     description:
@@ -658,14 +658,14 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.7.0"
+    version: "3.1.3"
   window_manager:
     dependency: transitive
     description:
       name: window_manager
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.6"
+    version: "0.3.0"
   window_to_front:
     dependency: transitive
     description:

package/lib/src/actions.dart

@@ -13,12 +13,13 @@ import 'protocol/remove_control_payload.dart';
 import 'protocol/replace_page_controls_payload.dart';
 import 'protocol/session_crashed_payload.dart';
 import 'protocol/update_control_props_payload.dart';
-import 'web_socket_client.dart';
+import 'flet_server.dart';
 
 class PageLoadAction {
   final Uri pageUri;
-  final WebSocketClient ws;
-  PageLoadAction(this.pageUri, this.ws);
+  final String assetsDir;
+  final FletServer server;
+  PageLoadAction(this.pageUri, this.assetsDir, this.server);
 }
 
 class PageReconnectingAction {
@@ -28,21 +29,21 @@ class PageReconnectingAction {
 class PageSizeChangeAction {
   final Size newPageSize;
   final WindowMediaData? wmd;
-  final WebSocketClient ws;
-  PageSizeChangeAction(this.newPageSize, this.wmd, this.ws);
+  final FletServer server;
+  PageSizeChangeAction(this.newPageSize, this.wmd, this.server);
 }
 
 class SetPageRouteAction {
   final String route;
-  final WebSocketClient ws;
-  SetPageRouteAction(this.route, this.ws);
+  final FletServer server;
+  SetPageRouteAction(this.route, this.server);
 }
 
 class WindowEventAction {
   final String eventName;
   final WindowMediaData wmd;
-  final WebSocketClient ws;
-  WindowEventAction(this.eventName, this.wmd, this.ws);
+  final FletServer server;
+  WindowEventAction(this.eventName, this.wmd, this.server);
 }
 
 class PageBrightnessChangeAction {
@@ -56,9 +57,9 @@ class RegisterWebClientAction {
 }
 
 class AppBecomeActiveAction {
-  final WebSocketClient ws;
+  final FletServer server;
   final AppBecomeActivePayload payload;
-  AppBecomeActiveAction(this.ws, this.payload);
+  AppBecomeActiveAction(this.server, this.payload);
 }
 
 class AppBecomeInactiveAction {
@@ -73,8 +74,8 @@ class SessionCrashedAction {
 
 class InvokeMethodAction {
   final InvokeMethodPayload payload;
-  final WebSocketClient ws;
-  InvokeMethodAction(this.payload, this.ws);
+  final FletServer server;
+  InvokeMethodAction(this.payload, this.server);
 }
 
 class AddPageControlsAction {

package/lib/src/controls/alert_dialog.dart

@@ -110,9 +110,9 @@ class _AlertDialogControlState extends State<AlertDialogControl> {
                   dispatch(UpdateControlPropsAction(
                       UpdateControlPropsPayload(props: props)));
                   FletAppServices.of(context)
-                      .ws
+                      .server
                       .updateControlProps(props: props);
-                  FletAppServices.of(context).ws.pageEventFromWeb(
+                  FletAppServices.of(context).server.sendPageEvent(
                       eventTarget: widget.control.id,
                       eventName: "dismiss",
                       eventData: "");