fastled 1.1.20__py2.py3-none-any.whl → 1.1.22__py2.py3-none-any.whl

fastled/__init__.py

@@ -1,3 +1,3 @@
 """FastLED Wasm Compiler package."""
 
-__version__ = "1.1.20"
+__version__ = "1.1.22"

fastled/app.py

@@ -1,481 +1,187 @@
-"""
-Uses the latest wasm compiler image to compile the FastLED sketch.
-"""
-
-import argparse
-import os
-import platform
-import shutil
-import subprocess
-import sys
-import tempfile
-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
-from fastled.docker_manager import DockerManager
-from fastled.filewatcher import FileWatcherProcess
-from fastled.keyboard import SpaceBarWatcher
-from fastled.open_browser import open_browser_thread
-from fastled.sketch import (
-    find_sketch_directories,
-    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
-PLATFORM_TAG: str = "-arm64" if IS_ARM else ""
-CONTAINER_NAME = f"fastled-wasm-compiler{PLATFORM_TAG}"
-DEFAULT_URL = "https://fastled.onrender.com"
-
-
-@dataclass
-class CompiledResult:
-    """Dataclass to hold the result of the compilation."""
-
-    success: bool
-    fastled_js: str
-    hash_value: str | None
-
-
-def parse_args() -> argparse.Namespace:
-    """Parse command-line arguments."""
-    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,
-        nargs="?",
-        default=None,
-        help="Directory containing the FastLED sketch to compile",
-    )
-    parser.add_argument(
-        "--just-compile",
-        action="store_true",
-        help="Just compile, skip opening the browser and watching for changes.",
-    )
-    parser.add_argument(
-        "--web",
-        "-w",
-        type=str,
-        nargs="?",
-        # const does not seem to be working as expected
-        const=DEFAULT_URL,  # Default value when --web is specified without value
-        help="Use web compiler. Optional URL can be provided (default: https://fastled.onrender.com)",
-    )
-    parser.add_argument(
-        "-i",
-        "--interactive",
-        action="store_true",
-        help="Run in interactive mode (Not available with --web)",
-    )
-    parser.add_argument(
-        "--profile",
-        action="store_true",
-        help="Enable profiling for web compilation",
-    )
-    parser.add_argument(
-        "--force-compile",
-        action="store_true",
-        help="Skips the test to see if the current directory is a valid FastLED sketch directory",
-    )
-    parser.add_argument(
-        "--no-auto-updates",
-        action="store_true",
-        help="Disable automatic updates of the wasm compiler image when using docker.",
-    )
-    parser.add_argument(
-        "--update",
-        action="store_true",
-        help="Update the wasm compiler (if necessary) before running",
-    )
-    parser.add_argument(
-        "--localhost",
-        "--local",
-        "-l",
-        action="store_true",
-        help="Use localhost for web compilation from an instance of fastled --server, creating it if necessary",
-    )
-    parser.add_argument(
-        "--server",
-        "-s",
-        action="store_true",
-        help="Run the server in the current directory, volume mapping fastled if we are in the repo",
-    )
-    build_mode = parser.add_mutually_exclusive_group()
-    build_mode.add_argument("--debug", action="store_true", help="Build in debug mode")
-    build_mode.add_argument(
-        "--quick",
-        action="store_true",
-        default=True,
-        help="Build in quick mode (default)",
-    )
-    build_mode.add_argument(
-        "--release", action="store_true", help="Build in release mode"
-    )
-
-    cwd_is_fastled = looks_like_fastled_repo(Path(os.getcwd()))
-
-    args = parser.parse_args()
-    if args.update:
-        args.auto_update = True
-    elif args.no_auto_updates:
-        args.auto_update = False
-    else:
-        args.auto_update = None
-
-    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 and not args.server:
-        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())
-        if looks_like_sketch_directory(maybe_sketch_dir):
-            args.directory = str(maybe_sketch_dir)
-        else:
-            sketch_directories = find_sketch_directories(maybe_sketch_dir)
-            if len(sketch_directories) == 1:
-                print(f"\nUsing sketch directory: {sketch_directories[0]}")
-                args.directory = str(sketch_directories[0])
-            elif len(sketch_directories) > 1:
-                print("\nMultiple Directories found, choose one:")
-                for i, sketch_dir in enumerate(sketch_directories):
-                    print(f"  [{i+1}]: {sketch_dir}")
-                which = input("\nPlease specify a sketch directory: ")
-                try:
-                    index = int(which) - 1
-                    args.directory = str(sketch_directories[index])
-                except (ValueError, IndexError):
-                    print("Invalid selection.")
-                    sys.exit(1)
-            else:
-                print(
-                    "\nYou either need to specify a sketch directory or run in --server mode."
-                )
-                sys.exit(1)
-    elif args.directory is not None and os.path.isfile(args.directory):
-        dir_path = Path(args.directory).parent
-        if looks_like_sketch_directory(dir_path):
-            print(f"Using sketch directory: {dir_path}")
-            args.directory = str(dir_path)
-
-    return args
-
-
-def run_web_compiler(
-    directory: Path,
-    host: str,
-    build_mode: BuildMode,
-    profile: bool,
-    last_hash_value: str | None,
-) -> CompiledResult:
-    input_dir = Path(directory)
-    output_dir = input_dir / "fastled_js"
-    start = time.time()
-    web_result = web_compile(
-        directory=input_dir, host=host, build_mode=build_mode, profile=profile
-    )
-    diff = time.time() - start
-    if not web_result.success:
-        print("\nWeb compilation failed:")
-        print(f"Time taken: {diff:.2f} seconds")
-        print(web_result.stdout)
-        return CompiledResult(success=False, fastled_js="", hash_value=None)
-
-    def print_results() -> None:
-        hash_value = (
-            web_result.hash_value
-            if web_result.hash_value is not None
-            else "NO HASH VALUE"
-        )
-        print(
-            f"\nWeb compilation successful\n  Time: {diff:.2f}\n  output: {output_dir}\n  hash: {hash_value}\n  zip size: {len(web_result.zip_bytes)} bytes"
-        )
-
-    # now check to see if the hash value is the same as the last hash value
-    if last_hash_value is not None and last_hash_value == web_result.hash_value:
-        print("\nSkipping redeploy: No significant changes found.")
-        print_results()
-        return CompiledResult(
-            success=True, fastled_js=str(output_dir), hash_value=web_result.hash_value
-        )
-
-    # Extract zip contents to fastled_js directory
-    output_dir.mkdir(exist_ok=True)
-    with tempfile.TemporaryDirectory() as temp_dir:
-        temp_path = Path(temp_dir)
-        temp_zip = temp_path / "result.zip"
-        temp_zip.write_bytes(web_result.zip_bytes)
-
-        # Clear existing contents
-        shutil.rmtree(output_dir, ignore_errors=True)
-        output_dir.mkdir(exist_ok=True)
-
-        # Extract zip contents
-        shutil.unpack_archive(temp_zip, output_dir, "zip")
-
-    print(web_result.stdout)
-    print_results()
-    return CompiledResult(
-        success=True, fastled_js=str(output_dir), hash_value=web_result.hash_value
-    )
-
-
-def _try_start_server_or_get_url(args: argparse.Namespace) -> str | CompileServer:
-    auto_update = args.auto_update
-    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):
-            return DEFAULT_URL
-        return args.web
-    else:
-        try:
-            print("No local server found, starting one...")
-            compile_server = CompileServer(auto_updates=auto_update)
-            print("Waiting for the local compiler to start...")
-            if not compile_server.wait_for_startup():
-                print("Failed to start local compiler.")
-                raise RuntimeError("Failed to start local compiler.")
-            return compile_server
-        except KeyboardInterrupt:
-            raise
-        except RuntimeError:
-            print("Failed to start local compile server, using web compiler instead.")
-            return DEFAULT_URL
-
-
-def run_client(args: argparse.Namespace) -> int:
-    compile_server: CompileServer | None = None
-    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(
-            "Error: Not a valid FastLED sketch directory, if you are sure it is, use --force-compile"
-        )
-        return 1
-
-    # If not explicitly using web compiler, check Docker installation
-    if not args.web and not DockerManager.is_docker_installed():
-        print(
-            "\nDocker is not installed on this system - switching to web compiler instead."
-        )
-        args.web = True
-
-    url: str
-    try:
-        try:
-            url_or_server: str | CompileServer = _try_start_server_or_get_url(args)
-            if isinstance(url_or_server, str):
-                print(f"Found URL: {url_or_server}")
-                url = url_or_server
-            else:
-                compile_server = url_or_server
-                print(f"Server started at {compile_server.url()}")
-                url = compile_server.url()
-        except KeyboardInterrupt:
-            print("\nExiting from first try...")
-            if compile_server:
-                compile_server.stop()
-            return 1
-        except Exception as e:
-            print(f"Error: {e}")
-            return 1
-        build_mode: BuildMode = get_build_mode(args)
-
-        def compile_function(
-            url: str = url,
-            build_mode: BuildMode = build_mode,
-            profile: bool = profile,
-            last_hash_value: str | None = None,
-        ) -> CompiledResult:
-            return run_web_compiler(
-                args.directory,
-                host=url,
-                build_mode=build_mode,
-                profile=profile,
-                last_hash_value=last_hash_value,
-            )
-
-        result: CompiledResult = compile_function(last_hash_value=None)
-        last_compiled_result: CompiledResult = result
-
-        if not result.success:
-            print("\nCompilation failed.")
-
-        browser_proc: subprocess.Popen | None = None
-        if open_web_browser:
-            browser_proc = open_browser_thread(Path(args.directory) / "fastled_js")
-        else:
-            print("\nCompilation successful.")
-            if compile_server:
-                print("Shutting down compile server...")
-                compile_server.stop()
-            return 0
-
-        if args.just_compile:
-            if compile_server:
-                compile_server.stop()
-            if browser_proc:
-                browser_proc.kill()
-            return 0 if result.success else 1
-    except KeyboardInterrupt:
-        print("\nExiting from main")
-        if compile_server:
-            compile_server.stop()
-        return 1
-
-    print("\nWatching for changes. Press Ctrl+C to stop...")
-    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:
-            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:
-        print("\nStopping watch mode...")
-        return 0
-    except Exception as e:
-        print(f"Error: {e}")
-        return 1
-    finally:
-        sketch_filewatcher.stop()
-        if compile_server:
-            compile_server.stop()
-        if browser_proc:
-            browser_proc.kill()
-
-
-def run_server(args: argparse.Namespace) -> int:
-    interactive = args.interactive
-    auto_update = args.auto_update
-    compile_server = CompileServer(interactive=interactive, auto_updates=auto_update)
-    if not interactive:
-        print(f"Server started at {compile_server.url()}")
-    compile_server.wait_for_startup()
-    try:
-        while True:
-            if not compile_server.proceess_running():
-                print("Server process is not running. Exiting...")
-                return 1
-            time.sleep(1)
-    except KeyboardInterrupt:
-        print("\nExiting from server...")
-        return 1
-    finally:
-        compile_server.stop()
-    return 0
-
-
-def main() -> int:
-    args = parse_args()
-    if args.server:
-        print("Running in server only mode.")
-        return run_server(args)
-    else:
-        print("Running in client/server mode.")
-        return run_client(args)
-
-
-if __name__ == "__main__":
-    try:
-        os.chdir("../fastled")
-        sys.argv.append("--server")
-        sys.exit(main())
-    except KeyboardInterrupt:
-        print("\nExiting from main...")
-        sys.exit(1)
-    except Exception as e:
-        print(f"Error: {e}")
-        sys.exit(1)
+"""
+Uses the latest wasm compiler image to compile the FastLED sketch.
+"""
+
+import argparse
+import os
+import sys
+import time
+from pathlib import Path
+
+from fastled import __version__
+from fastled.client_server import run_client_server
+from fastled.compile_server import CompileServer
+from fastled.env import DEFAULT_URL
+from fastled.select_sketch_directory import select_sketch_directory
+from fastled.sketch import (
+    find_sketch_directories,
+    looks_like_fastled_repo,
+    looks_like_sketch_directory,
+)
+
+
+def parse_args() -> argparse.Namespace:
+    """Parse command-line arguments."""
+    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,
+        nargs="?",
+        default=None,
+        help="Directory containing the FastLED sketch to compile",
+    )
+    parser.add_argument(
+        "--just-compile",
+        action="store_true",
+        help="Just compile, skip opening the browser and watching for changes.",
+    )
+    parser.add_argument(
+        "--web",
+        "-w",
+        type=str,
+        nargs="?",
+        # const does not seem to be working as expected
+        const=DEFAULT_URL,  # Default value when --web is specified without value
+        help="Use web compiler. Optional URL can be provided (default: https://fastled.onrender.com)",
+    )
+    parser.add_argument(
+        "-i",
+        "--interactive",
+        action="store_true",
+        help="Run in interactive mode (Not available with --web)",
+    )
+    parser.add_argument(
+        "--profile",
+        action="store_true",
+        help="Enable profiling for web compilation",
+    )
+    parser.add_argument(
+        "--force-compile",
+        action="store_true",
+        help="Skips the test to see if the current directory is a valid FastLED sketch directory",
+    )
+    parser.add_argument(
+        "--no-auto-updates",
+        action="store_true",
+        help="Disable automatic updates of the wasm compiler image when using docker.",
+    )
+    parser.add_argument(
+        "--update",
+        action="store_true",
+        help="Update the wasm compiler (if necessary) before running",
+    )
+    parser.add_argument(
+        "--localhost",
+        "--local",
+        "-l",
+        action="store_true",
+        help="Use localhost for web compilation from an instance of fastled --server, creating it if necessary",
+    )
+    parser.add_argument(
+        "--server",
+        "-s",
+        action="store_true",
+        help="Run the server in the current directory, volume mapping fastled if we are in the repo",
+    )
+    build_mode = parser.add_mutually_exclusive_group()
+    build_mode.add_argument("--debug", action="store_true", help="Build in debug mode")
+    build_mode.add_argument(
+        "--quick",
+        action="store_true",
+        default=True,
+        help="Build in quick mode (default)",
+    )
+    build_mode.add_argument(
+        "--release", action="store_true", help="Build in release mode"
+    )
+
+    cwd_is_fastled = looks_like_fastled_repo(Path(os.getcwd()))
+
+    args = parser.parse_args()
+    if args.update:
+        args.auto_update = True
+    elif args.no_auto_updates:
+        args.auto_update = False
+    else:
+        args.auto_update = None
+
+    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 and not args.server:
+        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())
+        if looks_like_sketch_directory(maybe_sketch_dir):
+            args.directory = str(maybe_sketch_dir)
+        else:
+            sketch_directories = find_sketch_directories(maybe_sketch_dir)
+            selected_dir = select_sketch_directory(sketch_directories, cwd_is_fastled)
+            if selected_dir:
+                print(f"Using sketch directory: {selected_dir}")
+                args.directory = selected_dir
+            else:
+                print(
+                    "\nYou either need to specify a sketch directory or run in --server mode."
+                )
+                sys.exit(1)
+    elif args.directory is not None and os.path.isfile(args.directory):
+        dir_path = Path(args.directory).parent
+        if looks_like_sketch_directory(dir_path):
+            print(f"Using sketch directory: {dir_path}")
+            args.directory = str(dir_path)
+
+    return args
+
+
+def run_server(args: argparse.Namespace) -> int:
+    interactive = args.interactive
+    auto_update = args.auto_update
+    compile_server = CompileServer(interactive=interactive, auto_updates=auto_update)
+    if not interactive:
+        print(f"Server started at {compile_server.url()}")
+    compile_server.wait_for_startup()
+    try:
+        while True:
+            if not compile_server.proceess_running():
+                print("Server process is not running. Exiting...")
+                return 1
+            time.sleep(1)
+    except KeyboardInterrupt:
+        print("\nExiting from server...")
+        return 1
+    finally:
+        compile_server.stop()
+    return 0
+
+
+def main() -> int:
+    args = parse_args()
+    if args.server:
+        print("Running in server only mode.")
+        return run_server(args)
+    else:
+        print("Running in client/server mode.")
+        return run_client_server(args)
+
+
+if __name__ == "__main__":
+    try:
+        os.chdir("../fastled")
+        sys.exit(main())
+    except KeyboardInterrupt:
+        print("\nExiting from main...")
+        sys.exit(1)
+    except Exception as e:
+        print(f"Error: {e}")
+        sys.exit(1)

fastled/client_server.py

@@ -0,0 +1,299 @@
+import argparse
+import shutil
+import subprocess
+import tempfile
+import time
+from pathlib import Path
+
+from fastled.build_mode import BuildMode, get_build_mode
+from fastled.compile_server import CompileServer
+from fastled.docker_manager import DockerManager
+from fastled.env import DEFAULT_URL
+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
+
+# CompiledResult
+from fastled.types import CompiledResult
+from fastled.web_compile import (
+    SERVER_PORT,
+    ConnectionResult,
+    find_good_connection,
+    web_compile,
+)
+
+
+def _run_web_compiler(
+    directory: Path,
+    host: str,
+    build_mode: BuildMode,
+    profile: bool,
+    last_hash_value: str | None,
+) -> CompiledResult:
+    input_dir = Path(directory)
+    output_dir = input_dir / "fastled_js"
+    start = time.time()
+    web_result = web_compile(
+        directory=input_dir, host=host, build_mode=build_mode, profile=profile
+    )
+    diff = time.time() - start
+    if not web_result.success:
+        print("\nWeb compilation failed:")
+        print(f"Time taken: {diff:.2f} seconds")
+        print(web_result.stdout)
+        return CompiledResult(success=False, fastled_js="", hash_value=None)
+
+    def print_results() -> None:
+        hash_value = (
+            web_result.hash_value
+            if web_result.hash_value is not None
+            else "NO HASH VALUE"
+        )
+        print(
+            f"\nWeb compilation successful\n  Time: {diff:.2f}\n  output: {output_dir}\n  hash: {hash_value}\n  zip size: {len(web_result.zip_bytes)} bytes"
+        )
+
+    # now check to see if the hash value is the same as the last hash value
+    if last_hash_value is not None and last_hash_value == web_result.hash_value:
+        print("\nSkipping redeploy: No significant changes found.")
+        print_results()
+        return CompiledResult(
+            success=True, fastled_js=str(output_dir), hash_value=web_result.hash_value
+        )
+
+    # Extract zip contents to fastled_js directory
+    output_dir.mkdir(exist_ok=True)
+    with tempfile.TemporaryDirectory() as temp_dir:
+        temp_path = Path(temp_dir)
+        temp_zip = temp_path / "result.zip"
+        temp_zip.write_bytes(web_result.zip_bytes)
+
+        # Clear existing contents
+        shutil.rmtree(output_dir, ignore_errors=True)
+        output_dir.mkdir(exist_ok=True)
+
+        # Extract zip contents
+        shutil.unpack_archive(temp_zip, output_dir, "zip")
+
+    print(web_result.stdout)
+    print_results()
+    return CompiledResult(
+        success=True, fastled_js=str(output_dir), hash_value=web_result.hash_value
+    )
+
+
+def _try_start_server_or_get_url(args: argparse.Namespace) -> str | CompileServer:
+    auto_update = args.auto_update
+    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):
+            return DEFAULT_URL
+        return args.web
+    else:
+        try:
+            print("No local server found, starting one...")
+            compile_server = CompileServer(auto_updates=auto_update)
+            print("Waiting for the local compiler to start...")
+            if not compile_server.wait_for_startup():
+                print("Failed to start local compiler.")
+                raise RuntimeError("Failed to start local compiler.")
+            return compile_server
+        except KeyboardInterrupt:
+            raise
+        except RuntimeError:
+            print("Failed to start local compile server, using web compiler instead.")
+            return DEFAULT_URL
+
+
+def run_client_server(args: argparse.Namespace) -> int:
+    compile_server: CompileServer | None = None
+    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(
+            "Error: Not a valid FastLED sketch directory, if you are sure it is, use --force-compile"
+        )
+        return 1
+
+    # If not explicitly using web compiler, check Docker installation
+    if not args.web and not DockerManager.is_docker_installed():
+        print(
+            "\nDocker is not installed on this system - switching to web compiler instead."
+        )
+        args.web = True
+
+    url: str
+    try:
+        try:
+            url_or_server: str | CompileServer = _try_start_server_or_get_url(args)
+            if isinstance(url_or_server, str):
+                print(f"Found URL: {url_or_server}")
+                url = url_or_server
+            else:
+                compile_server = url_or_server
+                print(f"Server started at {compile_server.url()}")
+                url = compile_server.url()
+        except KeyboardInterrupt:
+            print("\nExiting from first try...")
+            if compile_server:
+                compile_server.stop()
+            return 1
+        except Exception as e:
+            print(f"Error: {e}")
+            return 1
+        build_mode: BuildMode = get_build_mode(args)
+
+        def compile_function(
+            url: str = url,
+            build_mode: BuildMode = build_mode,
+            profile: bool = profile,
+            last_hash_value: str | None = None,
+        ) -> CompiledResult:
+            return _run_web_compiler(
+                args.directory,
+                host=url,
+                build_mode=build_mode,
+                profile=profile,
+                last_hash_value=last_hash_value,
+            )
+
+        result: CompiledResult = compile_function(last_hash_value=None)
+        last_compiled_result: CompiledResult = result
+
+        if not result.success:
+            print("\nCompilation failed.")
+
+        browser_proc: subprocess.Popen | None = None
+        if open_web_browser:
+            browser_proc = open_browser_thread(Path(args.directory) / "fastled_js")
+        else:
+            print("\nCompilation successful.")
+            if compile_server:
+                print("Shutting down compile server...")
+                compile_server.stop()
+            return 0
+
+        if args.just_compile:
+            if compile_server:
+                compile_server.stop()
+            if browser_proc:
+                browser_proc.kill()
+            return 0 if result.success else 1
+    except KeyboardInterrupt:
+        print("\nExiting from main")
+        if compile_server:
+            compile_server.stop()
+        return 1
+
+    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,
+    ) -> tuple[bool, 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 True, out
+        return False, last_compiled_result
+
+    def print_status() -> None:
+        print("Will compile on sketch changes or if you hit the space bar.")
+
+    print_status()
+    print("Press Ctrl+C to stop...")
+
+    try:
+        while True:
+            if SpaceBarWatcher.watch_space_bar_pressed(timeout=1.0):
+                print("Compiling...")
+                last_compiled_result = compile_function(last_hash_value=None)
+                if not last_compiled_result.success:
+                    print("\nRecompilation failed.")
+                else:
+                    print("\nRecompilation successful.")
+                # drain the space bar queue
+                SpaceBarWatcher.watch_space_bar_pressed()
+                print_status()
+                continue
+            changed, last_compiled_result = trigger_rebuild_if_sketch_changed(
+                last_compiled_result
+            )
+            if changed:
+                print_status()
+                continue
+            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.")
+                    while True:
+                        space_bar_pressed = SpaceBarWatcher.watch_space_bar_pressed(
+                            timeout=1.0
+                        )
+                        file_had_changes = (
+                            len(source_code_watcher.get_all_changes()) > 0
+                        )
+                        if space_bar_pressed or file_had_changes:
+                            if space_bar_pressed:
+                                print("Space bar pressed, triggering recompile...")
+                            elif file_had_changes:
+                                print("Changes detected, triggering recompile...")
+                            last_compiled_result = compile_function(
+                                last_hash_value=None
+                            )
+                            print("Finished recompile.")
+                            # Drain the space bar queue
+                            SpaceBarWatcher.watch_space_bar_pressed()
+                            print_status()
+                            continue
+
+    except KeyboardInterrupt:
+        print("\nStopping watch mode...")
+        return 0
+    except Exception as e:
+        print(f"Error: {e}")
+        return 1
+    finally:
+        sketch_filewatcher.stop()
+        if compile_server:
+            compile_server.stop()
+        if browser_proc:
+            browser_proc.kill()

fastled/env.py

@@ -0,0 +1,8 @@
+import os
+import platform
+
+MACHINE = platform.machine().lower()
+IS_ARM: bool = "arm" in MACHINE or "aarch64" in MACHINE
+PLATFORM_TAG: str = "-arm64" if IS_ARM else ""
+CONTAINER_NAME = f"fastled-wasm-compiler{PLATFORM_TAG}"
+DEFAULT_URL = str(os.environ.get("FASTLED_URL", "https://fastled.onrender.com"))

fastled/keyboard.py

@@ -5,8 +5,25 @@ import time
 from multiprocessing import Process, Queue
 from queue import Empty
 
+_WHITE_SPACE = [" ", "\r", "\n"]
 
+
+# Original space bar, but now also enter key.
 class SpaceBarWatcher:
+
+    @classmethod
+    def watch_space_bar_pressed(cls, timeout: float = 0) -> bool:
+        watcher = cls()
+        try:
+            start_time = time.time()
+            while True:
+                if watcher.space_bar_pressed():
+                    return True
+                if time.time() - start_time > timeout:
+                    return False
+        finally:
+            watcher.stop()
+
     def __init__(self) -> None:
         self.queue: Queue = Queue()
         self.queue_cancel: Queue = Queue()
@@ -31,7 +48,7 @@ class SpaceBarWatcher:
                 # Check if there's input ready
                 if msvcrt.kbhit():  # type: ignore
                     char = msvcrt.getch().decode()  # type: ignore
-                    if char == " ":
+                    if char in _WHITE_SPACE:
                         self.queue.put(ord(" "))
 
         else:  # Unix-like systems
@@ -52,7 +69,7 @@ class SpaceBarWatcher:
                     # Check if there's input ready
                     if select.select([sys.stdin], [], [], 0.1)[0]:
                         char = sys.stdin.read(1)
-                        if char == " ":
+                        if char in _WHITE_SPACE:
                             self.queue.put(ord(" "))
             finally:
                 termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)  # type: ignore
@@ -60,9 +77,12 @@ class SpaceBarWatcher:
     def space_bar_pressed(self) -> bool:
         found = False
         while not self.queue.empty():
-            key = self.queue.get()
-            if key == ord(" "):
-                found = True
+            try:
+                key = self.queue.get(block=False, timeout=0.1)
+                if key == ord(" "):
+                    found = True
+            except Empty:
+                break
         return found
 
     def stop(self) -> None:

fastled/select_sketch_directory.py

@@ -0,0 +1,35 @@
+from pathlib import Path
+
+from fastled.string_diff import string_diff_paths
+
+
+def select_sketch_directory(
+    sketch_directories: list[Path], cwd_is_fastled: bool
+) -> str | None:
+    if cwd_is_fastled:
+        exclude = ["src", "dev", "tests"]
+        for ex in exclude:
+            p = Path(ex)
+            if p in sketch_directories:
+                sketch_directories.remove(p)
+
+    if len(sketch_directories) == 1:
+        print(f"\nUsing sketch directory: {sketch_directories[0]}")
+        return str(sketch_directories[0])
+    elif len(sketch_directories) > 1:
+        print("\nMultiple Directories found, choose one:")
+        for i, sketch_dir in enumerate(sketch_directories):
+            print(f"  [{i+1}]: {sketch_dir}")
+        which = input("\nPlease specify a sketch directory: ")
+        try:
+            index = int(which) - 1
+            return str(sketch_directories[index])
+        except (ValueError, IndexError):
+            inputs = [p for p in sketch_directories]
+            top_hits: list[tuple[int, Path]] = string_diff_paths(which, inputs)
+            if len(top_hits) == 1:
+                example = top_hits[0][1]
+                return str(example)
+            else:
+                return select_sketch_directory([p for _, p in top_hits], cwd_is_fastled)
+    return None

fastled/string_diff.py

@@ -0,0 +1,37 @@
+from pathlib import Path
+
+from rapidfuzz.distance import Levenshtein
+
+
+# Returns the min distance strings. If there is a tie, it returns
+# all the strings that have the same min distance.
+# Returns a tuple of index and string.
+def string_diff(
+    input_string: str, string_list: list[str], ignore_case=True
+) -> list[tuple[int, str]]:
+
+    def normalize(s: str) -> str:
+        return s.lower() if ignore_case else s
+
+    distances = [
+        Levenshtein.distance(normalize(input_string), normalize(s)) for s in string_list
+    ]
+    min_distance = min(distances)
+    out: list[tuple[int, str]] = []
+    for i, d in enumerate(distances):
+        if d == min_distance:
+            out.append((i, string_list[i]))
+    return out
+
+
+def string_diff_paths(
+    input_string: str | Path, path_list: list[Path], ignore_case=True
+) -> list[tuple[int, Path]]:
+    string_list = [str(p) for p in path_list]
+    tmp = string_diff(str(input_string), string_list, ignore_case)
+    # out: list[tuple[int, Path]] = [(i, Path(path_list[j])) for i, j in tmp]
+    out: list[tuple[int, Path]] = []
+    for i, j in tmp:
+        p = Path(j)
+        out.append((i, p))
+    return out

fastled/types.py

@@ -0,0 +1,10 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class CompiledResult:
+    """Dataclass to hold the result of the compilation."""
+
+    success: bool
+    fastled_js: str
+    hash_value: str | None

{fastled-1.1.20.dist-info → fastled-1.1.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.20
+Version: 1.1.22
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -18,6 +18,7 @@ Requires-Dist: download
 Requires-Dist: filelock
 Requires-Dist: disklru>=2.0.1
 Requires-Dist: appdirs
+Requires-Dist: rapidfuzz
 
 # FastLED Wasm compiler
 
@@ -161,6 +162,8 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` is
 
 # Revisions
 
+  * 1.1.22 - Selecting sketch now allows strings and narrowing down paths if ambiguity
+  * 1.1.21 - Now always watches for space/enter key events to trigger a recompile.
   * 1.1.20 - Fixed a regression for 1.1.16 involving docker throwing an exception before DockerManager.is_running() could be called so it can be launched.
   * 1.1.19 - Automatically does a limit searches for sketch directories if you leave it blank.
   * 1.1.18 - Fixes for when the image has never been downloaded.

fastled-1.1.22.dist-info/RECORD

@@ -0,0 +1,25 @@
+fastled/__init__.py,sha256=Vwrw9C5ep3js4u63kaxEdkec1V40HfactjPKA7tUZv4,64
+fastled/app.py,sha256=UXHR4nFJzdU-3WGk9J7BB0RxkQVwKZ7XKCgfLp2yqW0,6281
+fastled/build_mode.py,sha256=joMwsV4K1y_LijT4gEAcjx69RZBoe_KmFmHZdPYbL_4,631
+fastled/cli.py,sha256=CNR_pQR0sNVPNuv8e_nmm-0PI8sU-eUBUgnWgWkzW9c,237
+fastled/client_server.py,sha256=TLEmCxafrcBzo9FAz3OlIIgsSbNpVGsSuvZnIXpHXBA,11090
+fastled/compile_server.py,sha256=aBdpILSRrDsCJ5e9g5uwIqt9bcqE_8FrSddCV2ygtrI,5401
+fastled/docker_manager.py,sha256=5IXaLt8k4WSSiWmvqMvwMYKngAgZ-t2p2deJ6cmJNwk,20434
+fastled/env.py,sha256=8wctQwl5qE4CI8NBugHtgMmUfEfHZ869JX5lGdSOJxc,304
+fastled/filewatcher.py,sha256=5dVmjEG23kMeJa29tRVm5XKSr9sTD4ME2boo-CFDuUM,6910
+fastled/keyboard.py,sha256=TkFjDxGtGdDbjQF_LRqp54hmdcKaXjf1olTT8l6dEJk,3170
+fastled/open_browser.py,sha256=RRHcsZ5Vzsw1AuZUEYuSfjKmf_9j3NGMDUR-FndHmqs,1483
+fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
+fastled/select_sketch_directory.py,sha256=S9h8pHCDshaUGHdXaaFoh8g189ewA-GbKVEHKyaO2iQ,1304
+fastled/sketch.py,sha256=5nRjg281lMH8Bo9wKjbcpTQCfEP574ZCG-lukvFmyQ8,2656
+fastled/string_diff.py,sha256=svtaQFGp4a6r2Qjx-Gxhna94wK-d8LKV4OCpKMXiHso,1164
+fastled/types.py,sha256=dDIsGHJkHNJ7B61wNp6X0JSLs_nrHiq7RlNqNWbwFec,194
+fastled/util.py,sha256=t4M3NFMhnCzfYbLvIyJi0RdFssZqbTN_vVIaej1WV-U,265
+fastled/web_compile.py,sha256=KuvKGdX6SSUUqC7YgX4T9SMSP5wdcPUhpg9-K9zPoTI,10378
+fastled/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
+fastled-1.1.22.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.1.22.dist-info/METADATA,sha256=Xr6-uF2ohZ8Jjg3FSxLojs5nK6w7nbJ_cZ_e_1eGVeY,14012
+fastled-1.1.22.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+fastled-1.1.22.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.1.22.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
+fastled-1.1.22.dist-info/RECORD,,

fastled-1.1.20.dist-info/RECORD

@@ -1,20 +0,0 @@
-fastled/__init__.py,sha256=p51kZEN1JznXCt_KUL-m7ZWLsSop3-7JuCT0ywmQs3A,64
-fastled/app.py,sha256=gLmma0cWlXgkCGPLt3DQIUAZuU3EdxfzNZfAi0ghEOI,16882
-fastled/build_mode.py,sha256=joMwsV4K1y_LijT4gEAcjx69RZBoe_KmFmHZdPYbL_4,631
-fastled/cli.py,sha256=CNR_pQR0sNVPNuv8e_nmm-0PI8sU-eUBUgnWgWkzW9c,237
-fastled/compile_server.py,sha256=aBdpILSRrDsCJ5e9g5uwIqt9bcqE_8FrSddCV2ygtrI,5401
-fastled/docker_manager.py,sha256=5IXaLt8k4WSSiWmvqMvwMYKngAgZ-t2p2deJ6cmJNwk,20434
-fastled/filewatcher.py,sha256=5dVmjEG23kMeJa29tRVm5XKSr9sTD4ME2boo-CFDuUM,6910
-fastled/keyboard.py,sha256=rqndglWYzRy6oiqHgsmx1peLd0Yrpci01zGENlCzh_s,2576
-fastled/open_browser.py,sha256=RRHcsZ5Vzsw1AuZUEYuSfjKmf_9j3NGMDUR-FndHmqs,1483
-fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
-fastled/sketch.py,sha256=5nRjg281lMH8Bo9wKjbcpTQCfEP574ZCG-lukvFmyQ8,2656
-fastled/util.py,sha256=t4M3NFMhnCzfYbLvIyJi0RdFssZqbTN_vVIaej1WV-U,265
-fastled/web_compile.py,sha256=KuvKGdX6SSUUqC7YgX4T9SMSP5wdcPUhpg9-K9zPoTI,10378
-fastled/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
-fastled-1.1.20.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.1.20.dist-info/METADATA,sha256=XyDrNrK_WIiy21Xj_xlIWUgfdMiZ0KGDnasYL-or2Xg,13814
-fastled-1.1.20.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
-fastled-1.1.20.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.1.20.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
-fastled-1.1.20.dist-info/RECORD,,