PyInstaller integration (#34)

* Test project.entry-points

* Add 1st version of PyInstaller hooks

* Package Fletd, custom host binding for Fletd

* Remove pyinstaller dependency

* Start Fletd without window on Windows

Author: FeodorFitsner

sdk/python/flet/__pyinstaller/__init__.py

@@ -0,0 +1,5 @@
+import os
+
+
+def get_hook_dirs():
+    return [os.path.dirname(__file__)]

sdk/python/flet/__pyinstaller/hook-flet.py

@@ -0,0 +1,11 @@
+import os
+
+# package entire "bin" folder
+bin_path = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, "bin"))
+
+# package "bin/fletd" only
+if os.getenv("PACKAGE_FLETD_ONLY"):
+    bin_path = os.path.join(bin_path, "fletd*")
+
+# binaries = [(bin_path, "flet/bin")]
+binaries = [(bin_path, "flet/bin")]

sdk/python/flet/__pyinstaller/rthooks.dat

@@ -0,0 +1,5 @@
+{
+    'flet': [
+        'pyi_rth_localhost_fletd.py'
+    ],
+}

sdk/python/flet/__pyinstaller/rthooks/pyi_rth_localhost_fletd.py

@@ -0,0 +1,6 @@
+import logging
+import os
+
+logging.info("Running PyInstaller runtime hook for Flet...")
+
+os.environ["FLET_SERVER_IP"] = "localhost"

sdk/python/flet/flet.py

@@ -279,13 +279,19 @@ def _start_flet_server(port, attached, assets_dir, web_renderer):
         log_level_name = logging.getLevelName(log_level).lower()
         args.extend(["--log-level", log_level_name])
 
+    startupinfo = None
+    if is_windows():
+        startupinfo = subprocess.STARTUPINFO()
+        startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+
     subprocess.Popen(
         args,
         env=fletd_env,
         creationflags=creationflags,
         start_new_session=start_new_session,
         stdout=subprocess.DEVNULL if log_level >= logging.WARNING else None,
         stderr=subprocess.DEVNULL if log_level >= logging.WARNING else None,
+        startupinfo=startupinfo,
     )
 
     return port

sdk/python/pyproject.toml

@@ -32,8 +32,10 @@ tests = [
     "pytest>=6.1.2",
 ]
 dev = [
-    "pre-commit>=2.17.0",
-]
+    "pre-commit>=2.17.0"]
+
+[project.entry-points.pyinstaller40]
+hook-dirs = "flet.__pyinstaller:get_hook_dirs"
 
 [build-system]
 requires = ["pdm-pep517"]

server/config/config.go

@@ -27,6 +27,7 @@ const (
 	defaultAppURL                  = "http://localhost:3000"
 	defaultServerPort              = 8550
 	serverPort                     = "SERVER_PORT"
+	serverIP                       = "SERVER_IP"
 	forceSSL                       = "FORCE_SSL"
 	defaultWebSocketMaxMessageSize = 2097152 // 2 MB
 	wsMaxMessageSize               = "WS_MAX_MESSAGE_SIZE"
@@ -170,6 +171,10 @@ func ServerPort() int {
 	return viper.GetInt(serverPort)
 }
 
+func ServerIP() string {
+	return viper.GetString(serverIP)
+}
+
 func MaxWebSocketMessageSize() int {
 	return viper.GetInt(wsMaxMessageSize)
 }

server/server/server.go

@@ -126,11 +126,12 @@ func Start(ctx context.Context, wg *sync.WaitGroup, serverPort int) {
 		}
 	})
 
-	log.Println("Starting server on port", serverPort)
+	addr := fmt.Sprintf("%s:%d", config.ServerIP(), serverPort)
+	log.Println("Starting server on", addr)
 
 	// Start and run the server
 	srv := &http.Server{
-		Addr:    fmt.Sprintf(":%d", serverPort),
+		Addr:    addr,
 		Handler: router,
 	}