fastled 1.2.76__tar.gz → 1.2.78__tar.gz

{fastled-1.2.76 → fastled-1.2.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.2.76
+Version: 1.2.78
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies

{fastled-1.2.76 → fastled-1.2.78}/compiler/compile.py

@@ -116,6 +116,23 @@ def _banner(msg: str) -> str:
     return banner
 
 
+def _chunked_print(text: str, lines_per_print: int = 10) -> None:
+    """Prints the text in chunks of the specified size."""
+    lines = text.splitlines()
+    buffer: list[str] = []
+
+    def flush() -> None:
+        if buffer:
+            print("\n".join(buffer))
+            buffer.clear()
+
+    for line in lines:
+        buffer.append(line)
+        if len(buffer) >= lines_per_print:
+            flush()
+    flush()
+
+
 def compile(
     compiler_root: Path, build_mode: BuildMode, auto_clean: bool, no_platformio: bool
 ) -> int:
@@ -140,7 +157,11 @@ def compile(
             cmd_list.append("-v")
 
     def _open_process(cmd_list: list[str] = cmd_list) -> subprocess.Popen:
-        print(_banner("Running command:\n  " + subprocess.list2cmdline(cmd_list)))
+        print(
+            _banner(
+                "Build started with command:\n  " + subprocess.list2cmdline(cmd_list)
+            )
+        )
         out = subprocess.Popen(
             cmd_list,
             cwd=compiler_root,
@@ -159,12 +180,11 @@ def compile(
             assert process.stdout is not None
             line: str
             for line in process.stdout:
-                processed_line = line.replace("fastled/src", "src")
-                timestamped_line = _timestamp_output(processed_line)
+                timestamped_line = _timestamp_output(line)
                 output_lines.append(timestamped_line)
             process.wait()
             relative_output = _make_timestamps_relative("\n".join(output_lines))
-            print(relative_output)
+            _chunked_print(relative_output)
             if process.returncode == 0:
                 print(_banner(f"Compilation successful on attempt {attempt}"))
                 return 0

{fastled-1.2.76 → fastled-1.2.78}/compiler/init_runtime.py

@@ -4,9 +4,17 @@ import warnings
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 
-COMPILER_ROOT = Path("/js")
-COMPILER_DIR = COMPILER_ROOT / "compiler"
-FASTLED_COMPILER_DIR = COMPILER_ROOT / "fastled/src/platforms/wasm/compiler"
+SRC_MAPPED_HOST_COMPLER_DIR = Path("/host/fastled/src/platforms/wasm/compiler")
+SRC_STANDARD_HOST_COMPILER_DIR = Path(
+    "/js/compiler/fastled/src/platforms/wasm/compiler"
+)
+
+COMPILER_TARGET = Path("/js")
+
+if SRC_MAPPED_HOST_COMPLER_DIR.exists():
+    SRC_COMPILER_DIR = SRC_MAPPED_HOST_COMPLER_DIR
+else:
+    SRC_COMPILER_DIR = SRC_STANDARD_HOST_COMPILER_DIR
 
 HERE = Path(__file__).parent
 
@@ -15,7 +23,7 @@ def copy_task(src: str | Path) -> None:
     src = Path(src)
     if "entrypoint.sh" in str(src):
         return
-    link_dst = COMPILER_ROOT / src.name
+    link_dst = COMPILER_TARGET / src.name
 
     # Handle shell scripts
     if src.suffix == ".sh":
@@ -55,10 +63,7 @@ def make_links() -> None:
     # Get all matching files in compiler directory
     files = []
     for pattern in patterns:
-        files.extend(glob.glob(str(COMPILER_DIR / pattern)))
-
-    for pattern in patterns:
-        files.extend(glob.glob(str(FASTLED_COMPILER_DIR / pattern)))
+        files.extend(glob.glob(str(SRC_COMPILER_DIR / pattern)))
 
     # Process files in parallel using ThreadPoolExecutor
     with ThreadPoolExecutor(max_workers=16) as executor:

{fastled-1.2.76 → fastled-1.2.78}/pyproject.toml

@@ -15,11 +15,13 @@ dependencies = [
     "httpx>=0.28.1",
     "watchdog>=6.0.0",
     "download>=0.3.5",
+    ########## Begin Docker Manager Dependencies
     "filelock>=3.16.1",
     "disklru>=2.0.1",
     "appdirs>=1.4.4",
     "rapidfuzz>=3.10.1",
     "progress>=1.6",
+    ########## End Docker Manager Dependencies
     "fastapi>=0.115.12",
     "uvicorn>=0.34.2",
     "pywebview>=5.4",

{fastled-1.2.76 → fastled-1.2.78}/src/fastled/__init__.py

@@ -7,17 +7,14 @@ from typing import Generator
 
 from .compile_server import CompileServer
 from .live_client import LiveClient
+from .settings import DOCKER_FILE, IMAGE_NAME
 from .site.build import build
 from .types import BuildMode, CompileResult, CompileServerError
 
 # IMPORTANT! There's a bug in github which will REJECT any version update
 # that has any other change in the repo. Please bump the version as the
 # ONLY change in a commit, or else the pypi update and the release will fail.
-__version__ = "1.2.76"
-
-DOCKER_FILE = (
-    "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"
-)
+__version__ = "1.2.78"
 
 
 class Api:
@@ -154,7 +151,6 @@ class Docker:
     @staticmethod
     def purge() -> None:
         from fastled.docker_manager import DockerManager
-        from fastled.settings import IMAGE_NAME
 
         docker_mgr = DockerManager()
         docker_mgr.purge(image_name=IMAGE_NAME)
@@ -217,4 +213,5 @@ __all__ = [
     "CompileResult",
     "CompileServerError",
     "BuildMode",
+    "DOCKER_FILE",
 ]

{fastled-1.2.76 → fastled-1.2.78}/src/fastled/app.py

@@ -68,19 +68,37 @@ def main() -> int:
         print("Building is disabled")
         build = False
 
-    if build:
-        raise NotImplementedError("Building is not yet supported.")
+    if interactive:
+        # raise NotImplementedError("Building is not yet supported.")
         file_watcher_set(False)
-        project_root = Path(".").absolute()
-        print(f"Building Docker image at {project_root}")
-        from fastled import Api, Docker
-
-        server = Docker.spawn_server_from_fastled_repo(
-            project_root=project_root,
+        # project_root = Path(".").absolute()
+        # print(f"Building Docker image at {project_root}")
+        from fastled import Api
+
+        # server = Docker.spawn_server_from_fastled_repo(
+        #     project_root=project_root,
+        #     interactive=interactive,
+        #     sketch_folder=directory,
+        # )
+        # assert isinstance(server, CompileServer)
+        server: CompileServer = CompileServer(
             interactive=interactive,
-            sketch_folder=directory,
+            auto_updates=False,
+            mapped_dir=directory,
+            auto_start=False,
+            remove_previous=False,
         )
-        assert isinstance(server, CompileServer)
+
+        server.start(wait_for_startup=False)
+
+        try:
+            while server.process_running():
+                # wait for ctrl-c
+                time.sleep(0.1)
+        except KeyboardInterrupt:
+            print("\nExiting from server...")
+            server.stop()
+            return 0
 
         try:
             if interactive:

fastled-1.2.78/src/fastled/cli_test_interactive.py

@@ -0,0 +1,21 @@
+import sys
+
+from fastled.app import main as app_main
+
+if __name__ == "__main__":
+    # Note that the entry point for the exe is in cli.py
+    try:
+        import os
+
+        os.chdir("../fastled")
+        # sys.argv.append("--server")
+        # sys.argv.append("--local")
+        sys.argv.append("examples/FxWave2d")
+        sys.argv.append("-i")
+        sys.exit(app_main())
+    except KeyboardInterrupt:
+        print("\nExiting from main...")
+        sys.exit(1)
+    except Exception as e:
+        print(f"Error: {e}")
+        sys.exit(1)

{fastled-1.2.76 → fastled-1.2.78}/src/fastled/client_server.py

@@ -381,12 +381,12 @@ def run_client_server(args: Args) -> int:
         url, compile_server = _try_start_server_or_get_url(auto_update, web, localhost)
     except KeyboardInterrupt:
         print("\nExiting from first try...")
-        if compile_server:
+        if compile_server is not None:
             compile_server.stop()
         return 1
     except Exception as e:
         print(f"Error: {e}")
-        if compile_server:
+        if compile_server is not None:
             compile_server.stop()
         return 1
 

{fastled-1.2.76 → fastled-1.2.78}/src/fastled/compile_server_impl.py

@@ -15,7 +15,6 @@ from fastled.docker_manager import (
     RunningContainer,
     Volume,
 )
-from fastled.interactive_srcs import INTERACTIVE_SOURCES
 from fastled.settings import DEFAULT_CONTAINER_NAME, IMAGE_NAME, SERVER_PORT
 from fastled.sketch import looks_like_fastled_repo
 from fastled.types import BuildMode, CompileResult, CompileServerError
@@ -37,6 +36,32 @@ def _try_get_fastled_src(path: Path) -> Path | None:
     return None
 
 
+def _port_is_free(port: int) -> bool:
+    """Check if a port is free."""
+    import socket
+
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+        try:
+            _ = sock.bind(("localhost", port)) and sock.bind(("0.0.0.0", port))
+            return True
+        except OSError:
+            return False
+
+
+def _find_free_port() -> int:
+    """Find a free port on the system."""
+
+    start_port = 49152
+    tries = 10
+
+    for port in range(start_port, start_port + tries):
+        if _port_is_free(port):
+            return port
+    raise RuntimeError(
+        f"No free port found in the range {start_port}-{start_port + tries - 1}"
+    )
+
+
 class CompileServerImpl:
     def __init__(
         self,
@@ -202,6 +227,7 @@ class CompileServerImpl:
             image_name=IMAGE_NAME, tag="latest", upgrade=upgrade
         )
         DISK_CACHE.put("last-update", now_str)
+        CLIENT_PORT = 80  # TODO: Don't use port 80.
 
         print("Docker image now validated")
         port = SERVER_PORT
@@ -209,7 +235,11 @@ class CompileServerImpl:
             server_command = ["/bin/bash"]
         else:
             server_command = ["python", "/js/run.py", "server"] + SERVER_OPTIONS
-        ports = {80: port}
+        if self.interactive:
+            print("Disabling port forwarding in interactive mode")
+            ports = {}
+        else:
+            ports = {CLIENT_PORT: port}
         volumes = []
         if self.fastled_src_dir:
             print(
@@ -238,20 +268,39 @@ class CompileServerImpl:
             )
             if self.fastled_src_dir is not None:
                 # to allow for interactive compilation
-                interactive_sources = list(INTERACTIVE_SOURCES)
-                for src in interactive_sources:
-                    src_path = Path(src).absolute()
+                # interactive_sources = list(INTERACTIVE_SOURCES)
+                interactive_sources: list[tuple[Path, str]] = []
+                init_runtime_py = (
+                    Path(self.fastled_src_dir)
+                    / ".."
+                    / ".."
+                    / "fastled-wasm"
+                    / "compiler"
+                    / "init_runtime.py"
+                )
+                if init_runtime_py.exists():
+                    # fastled-wasm is in a sister directory, mapping this in to the container.
+                    mapping = (
+                        init_runtime_py,
+                        "/js/init_runtime.py",
+                    )
+                    interactive_sources.append(mapping)
+
+                src_host: Path
+                dst_container: str
+                for src_host, dst_container in interactive_sources:
+                    src_path = Path(src_host).absolute()
                     if src_path.exists():
-                        print(f"Mounting {src} into container")
+                        print(f"Mounting {src_host} into container")
                         volumes.append(
                             Volume(
                                 host_path=str(src_path),
-                                container_path=f"/js/fastled/{src}",
+                                container_path=dst_container,
                                 mode="rw",
                             )
                         )
                     else:
-                        print(f"Could not find {src}")
+                        print(f"Could not find {src_path}")
 
         cmd_str = subprocess.list2cmdline(server_command)
         if not self.interactive:
@@ -269,6 +318,13 @@ class CompileServerImpl:
             print("Compile server starting")
             return port
         else:
+            client_port_mapped = CLIENT_PORT in ports
+            port_is_free = _port_is_free(CLIENT_PORT)
+            if client_port_mapped and port_is_free:
+                warnings.warn(
+                    f"Can't expose port {CLIENT_PORT}, disabling port forwarding in interactive mode"
+                )
+                ports = {}
             self.docker.run_container_interactive(
                 image_name=IMAGE_NAME,
                 tag="latest",

{fastled-1.2.76 → fastled-1.2.78}/src/fastled/print_filter.py

@@ -39,6 +39,10 @@ def _handle_ino_cpp(line: str) -> str:
     return line
 
 
+def _handle_fastled_src(line: str) -> str:
+    return line.replace("fastled/src", "src")
+
+
 class PrintFilterDefault(PrintFilter):
     """Provides default filtering for FastLED output."""
 
@@ -61,6 +65,9 @@ class PrintFilterFastled(PrintFilter):
             # print(line)
             if "# WASM is building" in line:
                 self.build_started = True
+            line = _handle_fastled_src(
+                line
+            )  # Always convert fastled/src to src for file matchups.
             if self.build_started or " error: " in line:
                 line = _handle_ino_cpp(line)
             out.append(line)

{fastled-1.2.76 → fastled-1.2.78}/src/fastled/settings.py

@@ -12,3 +12,7 @@ SERVER_PORT = 9021
 IMAGE_NAME = "niteris/fastled-wasm"
 DEFAULT_CONTAINER_NAME = "fastled-wasm-compiler"
 # IMAGE_TAG = "latest"
+
+DOCKER_FILE = (
+    "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"
+)

{fastled-1.2.76 → fastled-1.2.78}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.2.76
+Version: 1.2.78
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies

{fastled-1.2.76 → fastled-1.2.78}/src/fastled.egg-info/SOURCES.txt

@@ -65,12 +65,12 @@ src/fastled/__init__.py
 src/fastled/app.py
 src/fastled/cli.py
 src/fastled/cli_test.py
+src/fastled/cli_test_interactive.py
 src/fastled/client_server.py
 src/fastled/compile_server.py
 src/fastled/compile_server_impl.py
 src/fastled/docker_manager.py
 src/fastled/filewatcher.py
-src/fastled/interactive_srcs.py
 src/fastled/keyboard.py
 src/fastled/keyz.py
 src/fastled/live_client.py

fastled-1.2.76/src/fastled/interactive_srcs.py

@@ -1,5 +0,0 @@
-INTERACTIVE_SOURCES: list[str] = [
-    "/js/compiler/CMakeLists.txt",
-    "/js/compiler/build_archive.sh",
-    "/js/compiler/build.sh",
-]