fastled 1.2.84__tar.gz → 1.2.87__tar.gz

{fastled-1.2.84 → fastled-1.2.87}/PKG-INFO

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

fastled-1.2.87/build_local_docker.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env -S uv run
+
+# Requirements:
+# - python-dateutil
+
+# pyproject.toml
+# [project]
+# dependencies = [
+#   "python-dateutil"
+# ]
+
+import os
+import shutil
+import subprocess
+
+def _exec(cmd: str) -> int:
+    print(f"$ {cmd}")
+    return subprocess.call(cmd, shell=True)
+
+# Step 1: Stop containers and remove images
+_exec("docker compose down --remove-orphans --rmi all")
+
+# Step 2: Remove all dangling images
+_exec("docker image prune -f")
+
+# Step 3: Remove all images matching niteris/fastled-wasm
+images = subprocess.check_output(
+    "docker images --format '{{.Repository}} {{.ID}}'",
+    shell=True, text=True
+)
+
+for line in images.strip().splitlines():
+    repo, image_id = line.split()
+    if repo == "niteris/fastled-wasm":
+        _exec(f"docker rmi {image_id}")
+
+# Step 4: Optionally remove volumes
+# _exec("docker volume prune -f")  # Uncomment if you want to purge volumes too
+
+# Step 5: Remove local build artifacts (e.g., PlatformIO)
+if os.path.exists("build"):
+    print("Removing local build/ directory")
+    shutil.rmtree("build")
+
+
+# Step 6: Rebuild images
+_exec("docker compose build")

{fastled-1.2.84 → fastled-1.2.87}/compiler/compile.py

@@ -116,6 +116,11 @@ def _banner(msg: str) -> str:
     return banner
 
 
+def _print_banner(msg: str) -> None:
+    """Prints a banner with the given message."""
+    print(_banner(msg))
+
+
 def _chunked_print(text: str, lines_per_print: int = 10) -> None:
     """Prints the text in chunks of the specified size."""
     lines = text.splitlines()
@@ -189,13 +194,15 @@ def compile(
 
             process.wait()
 
+            print(_banner("Compilation process Finsished."))
+
             if process.returncode == 0:
-                print(_banner(f"Compilation successful on attempt {attempt}"))
+                print("\nCompilation successful.\n")
                 return 0
             else:
                 raise subprocess.CalledProcessError(process.returncode, ["pio", "run"])
         except subprocess.CalledProcessError:
-            print(f"Compilation failed on attempt {attempt}")
+            print(_banner(f"Compilation failed on attempt {attempt}"))
             if attempt == max_attempts:
                 print("Max attempts reached. Compilation failed.")
                 return 1

{fastled-1.2.84 → fastled-1.2.87}/compiler/server.py

@@ -77,6 +77,12 @@ _LIVE_GIT_UPDATES_INTERVAL = int(
 _ALLOW_SHUTDOWN = os.environ.get("ALLOW_SHUTDOWN", "false").lower() in ["true", "1"]
 _NO_SKETCH_CACHE = os.environ.get("NO_SKETCH_CACHE", "false").lower() in ["true", "1"]
 
+# debug is a 20mb payload for the symbol information.
+_ONLY_QUICK_BUILDS = os.environ.get("ONLY_QUICK_BUILDS", "false").lower() in [
+    "true",
+    "0",
+]
+
 
 # TODO - cleanup
 _NO_AUTO_UPDATE = (
@@ -255,6 +261,12 @@ def compile_source(
         diff = time.time() - epoch
         print(f" = SERVER {diff:.2f}s = {msg}")
 
+    if build_mode != "quick" and _ONLY_QUICK_BUILDS:
+        raise HTTPException(
+            status_code=400,
+            detail="Only quick builds are allowed in this version.",
+        )
+
     _print("Starting compile_source")
     global COMPILE_COUNT
     global COMPILE_FAILURES
@@ -439,7 +451,9 @@ def fetch_file(full_path: Path) -> tuple[bytes, str] | HTTPException:
         raise HTTPException(status_code=404, detail="File not found.")
     if not full_path.is_file():
         raise HTTPException(status_code=400, detail="Not a file.")
-    if not full_path.is_relative_to(FASTLED_SRC):
+    if not full_path.is_relative_to(FASTLED_SRC) and not full_path.is_relative_to(
+        "/emsdk"
+    ):
         raise HTTPException(status_code=400, detail="Invalid file path.")
 
     content = full_path.read_bytes()
@@ -664,6 +678,18 @@ async def static_files(file_path: str) -> Response:
             )
         content, media_type = result
         return Response(content=content, media_type=media_type)
+    elif file_path.startswith("js/drawfsource/emsdk/"):
+        relative_path = file_path[len("js/drawfsource/emsdk/") :]
+        full_path = Path("/") / "emsdk" / relative_path
+        result: tuple[bytes, str] | HTTPException = fetch_file(full_path=full_path)
+        if isinstance(result, HTTPException):
+            return Response(
+                content=result.detail,  # type: ignore
+                media_type="text/plain",
+                status_code=result.status_code,  # type: ignore
+            )
+        content, media_type = result
+        return Response(content=content, media_type=media_type)
 
     # If file not found or path doesn't match expected format
     return Response(

{fastled-1.2.84 → fastled-1.2.87}/src/fastled/__init__.py

@@ -14,7 +14,7 @@ from .types import BuildMode, CompileResult, CompileServerError, FileResponse
 # 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.84"
+__version__ = "1.2.87"
 
 
 class Api:

{fastled-1.2.84 → fastled-1.2.87}/src/fastled/compile_server_impl.py

@@ -25,6 +25,10 @@ SERVER_OPTIONS = [
     "--no-auto-update",  # Don't auto live updates from the git repo.
 ]
 
+LOCAL_DOCKER_ENV = {
+    "ONLY_QUICK_BUILDS": "0"  # When running docker always allow release and debug.
+}
+
 
 def _try_get_fastled_src(path: Path) -> Path | None:
     fastled_src_dir: Path | None = None
@@ -310,6 +314,7 @@ class CompileServerImpl:
                 ports=ports,
                 volumes=volumes,
                 remove_previous=self.interactive or self.remove_previous or updated,
+                environment=LOCAL_DOCKER_ENV,
             )
             self.running_container = self.docker.attach_and_run(container)
             assert self.running_container is not None, "Container should be running"
@@ -330,6 +335,7 @@ class CompileServerImpl:
                 command=cmd_str,
                 ports=ports,
                 volumes=volumes,
+                environment=LOCAL_DOCKER_ENV,
             )
 
             print("Exiting interactive mode")

{fastled-1.2.84 → fastled-1.2.87}/src/fastled/docker_manager.py

@@ -533,6 +533,7 @@ class DockerManager:
         volumes: list[Volume] | None = None,
         ports: dict[int, int] | None = None,
         remove_previous: bool = False,
+        environment: dict[str, str] | None = None,
     ) -> Container:
         """
         Run a container from an image. If it already exists with matching config, start it.
@@ -617,6 +618,7 @@ class DockerManager:
                 tty=True,
                 volumes=volumes_dict,
                 ports=ports,  # type: ignore
+                environment=environment,
                 remove=True,
             )
         return container
@@ -629,6 +631,7 @@ class DockerManager:
         command: str | None = None,
         volumes: list[Volume] | None = None,
         ports: dict[int, int] | None = None,
+        environment: dict[str, str] | None = None,
     ) -> None:
         # Convert volumes to the format expected by Docker API
         volumes = _hack_to_fix_mac(volumes)
@@ -663,6 +666,9 @@ class DockerManager:
             if ports:
                 for host_port, container_port in ports.items():
                     docker_command.extend(["-p", f"{host_port}:{container_port}"])
+            if environment:
+                for env_name, env_value in environment.items():
+                    docker_command.extend(["-e", f"{env_name}={env_value}"])
             docker_command.append(f"{image_name}:{tag}")
             if command:
                 docker_command.append(command)

fastled-1.2.87/src/fastled/print_filter.py

@@ -0,0 +1,190 @@
+import re
+import zlib
+from abc import ABC, abstractmethod
+from dataclasses import dataclass
+from enum import Enum
+
+
+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:
+    if ".ino.cpp" in line[0:30]:
+        # Extract the filename without path and extension
+        match = re.search(r"src/([^/]+)\.ino\.cpp", line)
+        if match:
+            filename = match.group(1)
+            # Replace with examples/Filename/Filename.ino format
+            line = line.replace(
+                f"src/{filename}.ino.cpp", f"examples/{filename}/{filename}.ino"
+            )
+        else:
+            # Fall back to simple extension replacement if regex doesn't match
+            line = line.replace(".ino.cpp", ".ino")
+    return line
+
+
+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:
+        super().__init__(echo)
+        self.build_started = False
+        # self.compile_link_active = False
+        # self.compile_link_filter:
+
+    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
+            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
+
+
+class CompileOrLink(Enum):
+    COMPILE = "compile"
+    LINK = "link"
+
+
+@dataclass
+class BuildArtifact:
+    timestamp: float
+    input_artifact: str | None
+    output_artifact: str | None
+    build_flags: str
+    compile_or_link: CompileOrLink
+    hash: int
+
+    def __str__(self) -> str:
+        return f"{self.timestamp} {self.output_artifact} {self.build_flags} {self.compile_or_link} {self.hash}"
+
+    @staticmethod
+    def parse(input_str: str) -> "BuildArtifact | None":
+        """
+        Parse a single build-log line of the form:
+          "<timestamp> ... <some .cpp or .h file> ... <flags>"
+
+        Returns a BuildArtifact, or None if parsing failed.
+        """
+        return _parse(input_str)
+
+
+class TokenFilter(ABC):
+    @abstractmethod
+    def extract(self, tokens: list[str]) -> str | None:
+        """
+        Scan `tokens`, remove any tokens this filter is responsible for,
+        and return the extracted string (or None if not found/invalid).
+        """
+        ...
+
+
+class TimestampFilter(TokenFilter):
+    def extract(self, tokens: list[str]) -> str | None:
+        if not tokens:
+            return None
+        candidate = tokens[0]
+        try:
+            _ = float(candidate)
+            return tokens.pop(0)
+        except ValueError:
+            return None
+
+
+class InputArtifactFilter(TokenFilter):
+    def extract(self, tokens: list[str]) -> str | None:
+        for i, tok in enumerate(tokens):
+            if tok.endswith(".cpp") or tok.endswith(".h"):
+                return tokens.pop(i)
+        return None
+
+
+class OutputArtifactFilter(TokenFilter):
+    def extract(self, tokens: list[str]) -> str | None:
+        for i, tok in enumerate(tokens):
+            if tok == "-o" and i + 1 < len(tokens):
+                tokens.pop(i)  # drop '-o'
+                return tokens.pop(i)  # drop & return artifact
+        return None
+
+
+class ActionFilter(TokenFilter):
+    def extract(self, tokens: list[str]) -> str | None:
+        if "-c" in tokens:
+            return CompileOrLink.COMPILE.value
+        return CompileOrLink.LINK.value
+
+
+def _parse(line: str) -> BuildArtifact | None:
+    tokens = line.strip().split()
+    if not tokens:
+        return None
+
+    # instantiate in the order we need them
+    filters: list[TokenFilter] = [
+        TimestampFilter(),
+        InputArtifactFilter(),
+        OutputArtifactFilter(),
+        ActionFilter(),
+    ]
+
+    # apply each filter
+    raw_ts = filters[0].extract(tokens)
+    raw_in = filters[1].extract(tokens)
+    raw_out = filters[2].extract(tokens)
+    raw_act = filters[3].extract(tokens)
+
+    if raw_ts is None or raw_in is None or raw_act is None:
+        return None
+
+    # the rest of `tokens` are the flags
+    flags_str = " ".join(tokens)
+    h = zlib.adler32(flags_str.encode("utf-8"))
+
+    return BuildArtifact(
+        timestamp=float(raw_ts),
+        input_artifact=raw_in,
+        output_artifact=raw_out,
+        build_flags=flags_str,
+        compile_or_link=CompileOrLink(raw_act),
+        hash=h,
+    )

{fastled-1.2.84 → fastled-1.2.87}/src/fastled/server_flask.py

@@ -23,7 +23,8 @@ else:
     logger = logging.getLogger("flask_server")
     logger.disabled = True
 
-_DRAWF_SOURCE_PREFIX = "drawfsource/js/fastled/src/"
+_DRAWF_SOURCE_FASTLED = "drawfsource/js/fastled/src/"
+_DRAWF_SOURCE_EMSDK = "drawfsource/js/drawfsource/emsdk/"
 
 
 def _run_flask_server(
@@ -126,24 +127,34 @@ def _run_flask_server(
                 return Response(f"Error: {str(e)}", status=500)
 
         def handle_dwarfsource(path: str) -> Response:
-            """Handle requests to /drawfsource/js/fastled/src/"""
+            """Handle requests to /drawfsource/js/fastled/src/
+            or /drawfsource/js/drawfsource/emsdk/*"""
             from flask import request
 
             start_time = time.time()
             logger.info(f"Processing request: {request.method} {request.url}")
 
-            if not path.startswith(_DRAWF_SOURCE_PREFIX):
+            if "../" in path:
+                # Prevent directory traversal attacks
+                error_msg = "Directory traversal attack detected"
+                logger.error(error_msg)
+                return Response(error_msg, status=400)
+
+            if not path.startswith(_DRAWF_SOURCE_FASTLED) and not path.startswith(
+                _DRAWF_SOURCE_EMSDK
+            ):
                 # unexpected
                 error_msg = f"Unexpected path: {path}"
                 logger.error(error_msg)
                 # Logging disabled
                 return Response("Malformed path", status=400)
 
-            path = path.replace("drawfsource/js/fastled/src/", "")
-            logger.info(f"Transformed path: {path}")
+            # Weird magic being played with these paths, it's beyond me.
+            if path.startswith(_DRAWF_SOURCE_FASTLED):
+                path = path[len("/drawfsource") :]
 
             # Forward the request to the compile server
-            target_url = f"http://localhost:{compile_server_port}/sourcefiles/{path}"
+            target_url = f"http://localhost:{compile_server_port}/drawfsource/{path}"
             logger.info(f"Requesting: {target_url}")
             logger.info(f"Processing dwarfsource request for {path}")
 

{fastled-1.2.84 → fastled-1.2.87}/src/fastled.egg-info/PKG-INFO

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

{fastled-1.2.84 → fastled-1.2.87}/src/fastled.egg-info/SOURCES.txt

@@ -112,6 +112,7 @@ tests/unit/test_cli.py
 tests/unit/test_compile_server.py
 tests/unit/test_docker_linux_on_windows.py
 tests/unit/test_embedded_data.py
+tests/unit/test_experimental_cpp_filter.py
 tests/unit/test_fetch_source_files.py
 tests/unit/test_filechanger.py
 tests/unit/test_http_server.py

{fastled-1.2.84 → fastled-1.2.87}/test

@@ -12,8 +12,14 @@ fi
 
 . ./activate
 
-echo "Rebuilding from local image"
-uv run build_local_docker.py
+# --full in args, then rebuild the docker image
+if [[ "$*" == *"--full"* ]]; then
+    echo "Rebuilding docker image"
+    echo "Rebuilding from local image"
+    uv run build_local_docker.py
+fi
+
+
 
 pytest -x -v -s --durations=0 tests/unit "$@"
 # uv run pytest -n auto tests -v