fastled 1.2.75__tar.gz → 1.2.77__tar.gz

{fastled-1.2.75 → fastled-1.2.77}/PKG-INFO

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

{fastled-1.2.75 → fastled-1.2.77}/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.75 → fastled-1.2.77}/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.75 → fastled-1.2.77}/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.75"
-
-DOCKER_FILE = (
-    "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"
-)
+__version__ = "1.2.77"
 
 
 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.75 → fastled-1.2.77}/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.77/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.75 → fastled-1.2.77}/src/fastled/compile_server_impl.py

@@ -37,6 +37,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 +228,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 +236,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(
@@ -269,6 +300,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.75 → fastled-1.2.77}/src/fastled/docker_manager.py

@@ -25,7 +25,7 @@ from docker.models.containers import Container
 from docker.models.images import Image
 from filelock import FileLock
 
-from fastled.print_filter import PrintFilter
+from fastled.print_filter import PrintFilter, PrintFilterFastled
 from fastled.spinner import Spinner
 
 CONFIG_DIR = Path(user_data_dir("fastled", "fastled"))
@@ -103,7 +103,7 @@ class Volume:
 # Override the default PrintFilter to use a custom one.
 def make_default_print_filter() -> PrintFilter:
     """Create a default PrintFilter instance."""
-    return PrintFilter()
+    return PrintFilterFastled()
 
 
 class RunningContainer:

{fastled-1.2.75 → fastled-1.2.77}/src/fastled/parse_args.py

@@ -24,10 +24,37 @@ def _find_fastled_repo(start: Path) -> Path | None:
     return None
 
 
+_DEFAULT_HELP_TEXT = """
+FastLED WASM Compiler - Useful options:
+  <directory>           Directory containing the FastLED sketch to compile
+  --init [example]      Initialize one of the top tier WASM examples
+  --web [url]           Use web compiler
+  --server              Run the compiler server
+  --debug               Build with debug symbols for dev-tools debugging
+  --quick               Build in quick mode (default)
+  --release             Build in optimized release mode
+  --profile             Enable profiling the C++ build system
+  --update              Update the docker image for the wasm compiler
+  --purge               Remove all FastLED containers and images
+  --version             Show version information
+  --help                Show detailed help
+Examples:
+  fastled (will auto detect the sketch directory and prompt you)
+  fastled my_sketch
+  fastled my_sketch --web (compiles using the web compiler only)
+  fastled --init Blink (initializes a new sketch directory with the Blink example)
+  fastled --server (runs the compiler server in the current directory)
+"""
+
+
 def parse_args() -> Args:
     """Parse command-line arguments."""
     from fastled import __version__
 
+    # Check if no arguments were provided
+    if len(sys.argv) == 1:
+        print(_DEFAULT_HELP_TEXT)
+
     parser = argparse.ArgumentParser(description=f"FastLED WASM Compiler {__version__}")
     parser.add_argument("--version", action="version", version=f"{__version__}")
     parser.add_argument(

{fastled-1.2.75 → fastled-1.2.77}/src/fastled/print_filter.py

@@ -1,4 +1,26 @@
 import re
+from abc import ABC, abstractmethod
+
+
+class PrintFilter(ABC):
+    """Abstract base class for filtering text output."""
+
+    def __init__(self, echo: bool = True) -> None:
+        self.echo = echo
+
+    @abstractmethod
+    def filter(self, text: str) -> str:
+        """Filter the text according to implementation-specific rules."""
+        pass
+
+    def print(self, text: str | bytes) -> str:
+        """Prints the text to the console after filtering."""
+        if isinstance(text, bytes):
+            text = text.decode("utf-8")
+        text = self.filter(text)
+        if self.echo:
+            print(text, end="")
+        return text
 
 
 def _handle_ino_cpp(line: str) -> str:
@@ -17,31 +39,37 @@ def _handle_ino_cpp(line: str) -> str:
     return line
 
 
-class PrintFilter:
-    """Provides filtering for text output so that source files match up with local names."""
+def _handle_fastled_src(line: str) -> str:
+    return line.replace("fastled/src", "src")
+
+
+class PrintFilterDefault(PrintFilter):
+    """Provides default filtering for FastLED output."""
+
+    def filter(self, text: str) -> str:
+        return text
+
+
+class PrintFilterFastled(PrintFilter):
+    """Provides filtering for FastLED output so that source files match up with local names."""
 
     def __init__(self, echo: bool = True) -> None:
-        self.echo = echo
+        super().__init__(echo)
         self.build_started = False
-        pass
 
-    def _filter_all(self, text: str) -> str:
+    def filter(self, text: str) -> str:
         lines = text.splitlines()
         out: list[str] = []
         for line in lines:
+            ## DEBUG DO NOT SUBMIT
+            # print(line)
             if "# WASM is building" in line:
                 self.build_started = True
-            if self.build_started:
+            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)
         text = "\n".join(out)
         return text
-
-    def print(self, text: str | bytes) -> str:
-        """Prints the text to the console."""
-        if isinstance(text, bytes):
-            text = text.decode("utf-8")
-        text = self._filter_all(text)
-        if self.echo:
-            print(text, end="")
-        return text

{fastled-1.2.75 → fastled-1.2.77}/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.75 → fastled-1.2.77}/src/fastled/types.py

@@ -4,6 +4,8 @@ from enum import Enum
 from pathlib import Path
 from typing import Any
 
+from fastled.print_filter import PrintFilterFastled
+
 
 @dataclass
 class Args:
@@ -102,6 +104,11 @@ class CompileResult:
     def to_dict(self) -> dict[str, Any]:
         return self.__dict__.copy()
 
+    def __post_init__(self):
+        # Filter the stdout.
+        pf = PrintFilterFastled(echo=False)
+        self.stdout = pf.print(self.stdout)
+
 
 class CompileServerError(Exception):
     """Error class for failing to instantiate CompileServer."""

{fastled-1.2.75 → fastled-1.2.77}/src/fastled/web_compile.py

@@ -4,6 +4,7 @@ import json
 import os
 import shutil
 import tempfile
+import time
 import zipfile
 from concurrent.futures import Future, ThreadPoolExecutor, as_completed
 from dataclasses import dataclass
@@ -154,6 +155,37 @@ def find_good_connection(
     return None
 
 
+def _banner(msg: str) -> str:
+    """
+    Create a banner for the given message.
+    Example:
+    msg = "Hello, World!"
+    print -> "#################"
+             "# Hello, World! #"
+             "#################"
+    """
+    lines = msg.split("\n")
+    # Find the width of the widest line
+    max_width = max(len(line) for line in lines)
+    width = max_width + 4  # Add 4 for "# " and " #"
+
+    # Create the top border
+    banner = "\n" + "#" * width + "\n"
+
+    # Add each line with proper padding
+    for line in lines:
+        padding = max_width - len(line)
+        banner += f"# {line}{' ' * padding} #\n"
+
+    # Add the bottom border
+    banner += "#" * width + "\n"
+    return banner
+
+
+def _print_banner(msg: str) -> None:
+    print(_banner(msg))
+
+
 def web_compile(
     directory: Path | str,
     host: str | None = None,
@@ -161,11 +193,12 @@ def web_compile(
     build_mode: BuildMode | None = None,
     profile: bool = False,
 ) -> CompileResult:
+    start_time = time.time()
     if isinstance(directory, str):
         directory = Path(directory)
     host = _sanitize_host(host or DEFAULT_HOST)
     build_mode = build_mode or BuildMode.QUICK
-    print("Compiling on", host)
+    _print_banner(f"Compiling on {host}")
     auth_token = auth_token or _AUTH_TOKEN
     if not directory.exists():
         raise FileNotFoundError(f"Directory not found: {directory}")
@@ -186,7 +219,7 @@ def web_compile(
 
         connection_result = find_good_connection(urls)
         if connection_result is None:
-            print("Connection failed to all endpoints")
+            _print_banner("Connection failed to all endpoints")
             return CompileResult(
                 success=False,
                 stdout="Connection failed",
@@ -270,6 +303,9 @@ def web_compile(
                             relative_path = file_path.relative_to(extract_path)
                             out_zip.write(file_path, relative_path)
 
+                diff_time = time.time() - start_time
+                msg = f"Compilation success, took {diff_time:.2f} seconds"
+                _print_banner(msg)
                 return CompileResult(
                     success=True,
                     stdout=stdout,

{fastled-1.2.75 → fastled-1.2.77}/src/fastled.egg-info/PKG-INFO

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

{fastled-1.2.75 → fastled-1.2.77}/src/fastled.egg-info/SOURCES.txt

@@ -65,6 +65,7 @@ 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

{fastled-1.2.75 → fastled-1.2.77}/tests/unit/test_bad_ino.py

@@ -35,7 +35,15 @@ class WebCompileTester(unittest.TestCase):
             print("stdout:")
             print(result.stdout)
             self.fail("Expected error not found in stdout")
-        # self.assertIn("lsfjsdklfjdskfjkasdfjdsfds", result.stdout)
+        if "bad/bad.ino:" not in result.stdout:  # No .cpp extension.
+            print(
+                "bad.ino.cpp was not transformed to bad.ino without the cpp extension"
+            )
+            print("stdout:")
+            print(result.stdout)
+            self.fail(
+                "bad.ino.cpp was not transformed to bad.ino without the cpp extension"
+            )
 
         print(f"Zip size: {len(result.zip_bytes)} bytes")
 

{fastled-1.2.75 → fastled-1.2.77}/tests/unit/test_print_filter.py

@@ -4,18 +4,20 @@ Unit test file.
 
 import unittest
 
-from fastled.print_filter import PrintFilter
+from fastled.print_filter import PrintFilterFastled
 
 
 class PrintFitlerTester(unittest.TestCase):
     """Main tester class."""
 
-    def test_live_client(self) -> None:
+    def test_print_filter(self) -> None:
         """Tests that a project can be filtered"""
         # Test the PrintFilter class
-        pf = PrintFilter(echo=False)
+        pf = PrintFilterFastled(echo=False)
         pf.print("# WASM is building")  # This should trigger the filter.
-        result = pf.print("src/XYPath.ino.cpp")  # This should now be transformed.
+        result = pf.print(
+            "5.36 src/XYPath.ino.cpp:4:1: error: unknown type name 'kdsjfsdkfjsd'"
+        )  # This should now be transformed.
         self.assertNotIn(".ino.cpp", result, "Expected .ino.cpp to be filtered out")
         self.assertIn(
             "examples/XYPath/XYPath.ino", result, "Expected path to be transformed"