fastled 1.1.7__py2.py3-none-any.whl → 1.1.16__py2.py3-none-any.whl

fastled/__init__.py

@@ -0,0 +1,3 @@
+"""FastLED Wasm Compiler package."""
+
+__version__ = "1.1.16"

fastled/app.py

@@ -1,7 +1,5 @@
 """
 Uses the latest wasm compiler image to compile the FastLED sketch.
-
-
 """
 
 import argparse
@@ -15,13 +13,20 @@ import time
 from dataclasses import dataclass
 from pathlib import Path
 
+from fastled import __version__
 from fastled.build_mode import BuildMode, get_build_mode
-from fastled.compile_server import CompileServer, looks_like_fastled_repo
+from fastled.compile_server import CompileServer
 from fastled.docker_manager import DockerManager
-from fastled.filewatcher import FileChangedNotifier
+from fastled.filewatcher import FileWatcherProcess
+from fastled.keyboard import SpaceBarWatcher
 from fastled.open_browser import open_browser_thread
-from fastled.sketch import looks_like_sketch_directory
-from fastled.web_compile import web_compile
+from fastled.sketch import looks_like_fastled_repo, looks_like_sketch_directory
+from fastled.web_compile import (
+    SERVER_PORT,
+    ConnectionResult,
+    find_good_connection,
+    web_compile,
+)
 
 machine = platform.machine().lower()
 IS_ARM: bool = "arm" in machine or "aarch64" in machine
@@ -39,12 +44,12 @@ class CompiledResult:
     hash_value: str | None
 
 
-DOCKER = DockerManager(container_name=CONTAINER_NAME)
-
-
 def parse_args() -> argparse.Namespace:
     """Parse command-line arguments."""
-    parser = argparse.ArgumentParser(description="FastLED WASM Compiler")
+    parser = argparse.ArgumentParser(description=f"FastLED WASM Compiler {__version__}")
+    parser.add_argument(
+        "--version", action="version", version=f"%(prog)s {__version__}"
+    )
     parser.add_argument(
         "directory",
         type=str,
@@ -88,6 +93,12 @@ def parse_args() -> argparse.Namespace:
     build_mode.add_argument(
         "--release", action="store_true", help="Build in release mode"
     )
+    build_mode.add_argument(
+        "--localhost",
+        "--local",
+        action="store_true",
+        help="Use localhost for web compilation from an instance of fastled --server, creating it if necessary",
+    )
     build_mode.add_argument(
         "--server",
         action="store_true",
@@ -100,9 +111,20 @@ def parse_args() -> argparse.Namespace:
         help="Skips the test to see if the current directory is a valid FastLED sketch directory",
     )
 
+    cwd_is_fastled = looks_like_fastled_repo(Path(os.getcwd()))
+
     args = parser.parse_args()
-    if args.server and args.web:
-        parser.error("--server and --web are mutually exclusive")
+    if not cwd_is_fastled and not args.localhost and not args.web and not args.server:
+        print(f"Using web compiler at {DEFAULT_URL}")
+        args.web = DEFAULT_URL
+    if cwd_is_fastled and not args.web:
+        print("Forcing --local mode because we are in the FastLED repo")
+        args.localhost = True
+    if args.localhost:
+        args.web = "localhost"
+    if args.interactive and not args.server:
+        print("--interactive forces --server mode")
+        args.server = True
     if args.directory is None and not args.server:
         # does current directory look like a sketch?
         maybe_sketch_dir = Path(os.getcwd())
@@ -113,6 +135,7 @@ def parse_args() -> argparse.Namespace:
                 "\nYou either need to specify a sketch directory or run in --server mode."
             )
             sys.exit(1)
+
     return args
 
 
@@ -176,7 +199,24 @@ def run_web_compiler(
 
 
 def _try_start_server_or_get_url(args: argparse.Namespace) -> str | CompileServer:
-    if args.web:
+    is_local_host = "localhost" in args.web or "127.0.0.1" in args.web or args.localhost
+
+    # test to see if there is already a local host server
+    local_host_needs_server = False
+    if is_local_host:
+        addr = "localhost" if args.localhost else args.web
+        urls = [addr]
+        if ":" not in addr:
+            urls.append(f"{addr}:{SERVER_PORT}")
+
+        result: ConnectionResult | None = find_good_connection(urls)
+        if result is not None:
+            print(f"Found local server at {result.host}")
+            return result.host
+        else:
+            local_host_needs_server = True
+
+    if not local_host_needs_server and args.web:
         if isinstance(args.web, str):
             return args.web
         if isinstance(args.web, bool):
@@ -184,6 +224,7 @@ def _try_start_server_or_get_url(args: argparse.Namespace) -> str | CompileServe
         return args.web
     else:
         try:
+            print("No local server found, starting one...")
             compile_server = CompileServer()
             print("Waiting for the local compiler to start...")
             if not compile_server.wait_for_startup():
@@ -199,7 +240,7 @@ def _try_start_server_or_get_url(args: argparse.Namespace) -> str | CompileServe
 
 def run_client(args: argparse.Namespace) -> int:
     compile_server: CompileServer | None = None
-    open_web_browser = not args.just_compile
+    open_web_browser = not args.just_compile and not args.interactive
     profile = args.profile
     if not args.force_compile and not looks_like_sketch_directory(Path(args.directory)):
         print(
@@ -208,7 +249,7 @@ def run_client(args: argparse.Namespace) -> int:
         return 1
 
     # If not explicitly using web compiler, check Docker installation
-    if not args.web and not DOCKER.is_docker_installed():
+    if not args.web and not DockerManager.is_docker_installed():
         print(
             "\nDocker is not installed on this system - switching to web compiler instead."
         )
@@ -260,9 +301,7 @@ def run_client(args: argparse.Namespace) -> int:
         if open_web_browser:
             browser_proc = open_browser_thread(Path(args.directory) / "fastled_js")
         else:
-            print(
-                "\nCompilation successful. Run without --just-compile to open in browser and watch for changes."
-            )
+            print("\nCompilation successful.")
             if compile_server:
                 print("Shutting down compile server...")
                 compile_server.stop()
@@ -280,40 +319,76 @@ def run_client(args: argparse.Namespace) -> int:
             compile_server.stop()
         return 1
 
-    # Watch mode
     print("\nWatching for changes. Press Ctrl+C to stop...")
-    watcher = FileChangedNotifier(args.directory, excluded_patterns=["fastled_js"])
-    watcher.start()
+    sketch_filewatcher = FileWatcherProcess(
+        args.directory, excluded_patterns=["fastled_js"]
+    )
+
+    source_code_watcher: FileWatcherProcess | None = None
+    if compile_server and compile_server.using_fastled_src_dir_volume():
+        assert compile_server.fastled_src_dir is not None
+        source_code_watcher = FileWatcherProcess(
+            compile_server.fastled_src_dir, excluded_patterns=[]
+        )
+
+    def trigger_rebuild_if_sketch_changed(
+        last_compiled_result: CompiledResult,
+    ) -> CompiledResult:
+        changed_files = sketch_filewatcher.get_all_changes()
+        if changed_files:
+            print(f"\nChanges detected in {changed_files}")
+            last_hash_value = last_compiled_result.hash_value
+            out = compile_function(last_hash_value=last_hash_value)
+            if not out.success:
+                print("\nRecompilation failed.")
+            else:
+                print("\nRecompilation successful.")
+            return out
+        return last_compiled_result
 
     try:
         while True:
-            try:
-                changed_files = watcher.get_all_changes()
-            except KeyboardInterrupt:
-                print("\nExiting from watcher...")
-                raise
-            except Exception as e:
-                print(f"Error getting changes: {e}")
-                changed_files = []
-            if changed_files:
-                print(f"\nChanges detected in {changed_files}")
-                last_hash_value = last_compiled_result.hash_value
-                result = compile_function(last_hash_value=last_hash_value)
-                if not result.success:
-                    print("\nRecompilation failed.")
-                else:
-                    print("\nRecompilation successful.")
-            time.sleep(0.3)
+            last_compiled_result = trigger_rebuild_if_sketch_changed(
+                last_compiled_result
+            )
+            if compile_server and not compile_server.proceess_running():
+                print("Server process is not running. Exiting...")
+                return 1
+            if source_code_watcher is not None:
+                changed_files = source_code_watcher.get_all_changes()
+                # de-duplicate changes
+                changed_files = sorted(list(set(changed_files)))
+                if changed_files:
+                    print(f"\nChanges detected in FastLED source code: {changed_files}")
+                    print("Press space bar to trigger compile.")
+
+                    space_key_watcher = SpaceBarWatcher()
+                    try:
+                        while True:
+                            if space_key_watcher.space_bar_pressed():
+                                print("Space bar pressed, triggering recompile...")
+                                last_compiled_result = compile_function(
+                                    last_hash_value=None
+                                )
+                                print("Finished recompile.")
+                                break
+                            elif len(sketch_filewatcher.get_all_changes()) > 0:
+                                last_compiled_result = compile_function(
+                                    last_hash_value=None
+                                )
+                                break
+                            time.sleep(0.1)
+                    finally:
+                        space_key_watcher.stop()
+
     except KeyboardInterrupt:
-        watcher.stop()
         print("\nStopping watch mode...")
         return 0
     except Exception as e:
-        watcher.stop()
         print(f"Error: {e}")
         return 1
     finally:
-        watcher.stop()
+        sketch_filewatcher.stop()
         if compile_server:
             compile_server.stop()
         if browser_proc:
@@ -342,13 +417,7 @@ def run_server(args: argparse.Namespace) -> int:
 
 def main() -> int:
     args = parse_args()
-    target_dir = Path(args.directory)
-    cwd_is_target_dir = target_dir == Path(os.getcwd())
-    force_server = cwd_is_target_dir and looks_like_fastled_repo(target_dir)
-    auto_server = (args.server or args.interactive or cwd_is_target_dir) and (
-        not args.web and not args.just_compile
-    )
-    if auto_server or force_server:
+    if args.server:
         print("Running in server only mode.")
         return run_server(args)
     else:
@@ -358,13 +427,8 @@ def main() -> int:
 
 if __name__ == "__main__":
     try:
-        project_root = Path(__file__).resolve().parent.parent.parent
-        print(f"Project root: {project_root}")
-        os.chdir(project_root)
         os.chdir("../fastled")
-        sys.argv.append("examples/wasm")
         sys.argv.append("--server")
-        sys.argv.append("--interactive")
         sys.exit(main())
     except KeyboardInterrupt:
         print("\nExiting from main...")