fastled 1.2.84__py3-none-any.whl → 1.2.87__py3-none-any.whl

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/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/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/print_filter.py

@@ -1,5 +1,8 @@
 import re
+import zlib
 from abc import ABC, abstractmethod
+from dataclasses import dataclass
+from enum import Enum
 
 
 class PrintFilter(ABC):
@@ -56,6 +59,8 @@ class PrintFilterFastled(PrintFilter):
     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()
@@ -73,3 +78,113 @@ class PrintFilterFastled(PrintFilter):
             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/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.dist-info → fastled-1.2.87.dist-info}/METADATA

@@ -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.dist-info → fastled-1.2.87.dist-info}/RECORD

@@ -1,12 +1,12 @@
-fastled/__init__.py,sha256=hVVZOZS8MY35SzgumbD6jMLfUY0Kg34cBiADzA5cV3Q,7044
+fastled/__init__.py,sha256=pXj8FDhKR-hgY-Su4vkm_F5lh4GrG-pJ8tYX73QaSxE,7044
 fastled/app.py,sha256=0W8Mbplo5UCRzj7nMVgkmCBddQGufsUQjkUUT4pMp74,4611
 fastled/cli.py,sha256=FjVr31ht0UPlAcmX-84NwfAGMQHTkrCe4o744jCAxiw,375
 fastled/cli_test.py,sha256=qJB9yLRFR3OwOwdIWSQ0fQsWLnA37v5pDccufiP_hTs,512
 fastled/cli_test_interactive.py,sha256=BjNhveZOk5aCffHbcrxPQQjWmAuj4ClVKKcKX5eY6yM,542
 fastled/client_server.py,sha256=4oRDccFMifTZPPtOYIfo4xJBJ8oE7gylVF75Rhytwig,17319
 fastled/compile_server.py,sha256=sRiXYzw7lv9vcWJWGPUkzOGZPmvZGV_TGwbHYoRc15s,3155
-fastled/compile_server_impl.py,sha256=t7y19DDB0auH1MmYLCi4yjc_ZyDUJ-WHy14QWTJ-pq8,13043
-fastled/docker_manager.py,sha256=SC_qV6grNTGh0QD1ubKrULQblrN-2PORocISlaZg9NQ,35156
+fastled/compile_server_impl.py,sha256=FxTuQTojpA7j59v7zSGh1LEeG4Yu0MFgW9SKfHpspQg,13243
+fastled/docker_manager.py,sha256=_qoDW34jEHTn3Yvxkv8iRUCr2csJnW6okT-FkXhJxzE,35468
 fastled/filewatcher.py,sha256=3qS3L7zMQhFuVrkeGn1djsB_cB6x_E2YGJmmQWVAU_w,10033
 fastled/keyboard.py,sha256=UTAsqCn1UMYnB8YDzENiLTj4GeL45tYfEcO7_5fLFEg,3556
 fastled/keyz.py,sha256=LO-8m_7CpNDiZLM-FXhQ30f9gN1bUYz5lOsUPTIbI-c,4020
@@ -14,10 +14,10 @@ fastled/live_client.py,sha256=yoAul8tVgbbPf1oEC79SUZSHkLECxlrXxgWR9XaBIp4,2957
 fastled/open_browser.py,sha256=DFyMrc1qic4Go7eLNPqMaLuMvTaE73NixdfSKV0yyp8,3709
 fastled/parse_args.py,sha256=waNeATOEz8D50Py5-9p6HcVSa21piTOAWOXS3ag8PYo,9428
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
-fastled/print_filter.py,sha256=ZpebuqfWEraSBD3Dm0PVZhQVBnU_NSILniwBHwjC1qM,2342
+fastled/print_filter.py,sha256=B0v493WAFN8DgG7aqM8iXMqI_V1EdMMvOnNQ26JNUxU,5499
 fastled/project_init.py,sha256=bBt4DwmW5hZkm9ICt9Qk-0Nr_0JQM7icCgH5Iv-bCQs,3984
 fastled/select_sketch_directory.py,sha256=-eudwCns3AKj4HuHtSkZAFwbnf005SNL07pOzs9VxnE,1383
-fastled/server_flask.py,sha256=a8IOX7cgXB9agwF9hlMuAk5fNMAoclSprl0iECcH4qo,17617
+fastled/server_flask.py,sha256=fbLuF993pbBqoyMbjHT1GPwjlxBib3cUUW719PNfN1w,18108
 fastled/server_start.py,sha256=W9yKStkRlRNuXeV6j_6O7HjjFPyVLBHMcF9Uy2QjDWQ,479
 fastled/settings.py,sha256=oezRvRUJWwauO-kpC4LDbKg6Q-ij4d09UtR2vkjSAPU,575
 fastled/sketch.py,sha256=tHckjDj8P6BI_LWzUFM071a9qcqPs-r-qFWIe50P5Xw,3391
@@ -33,9 +33,9 @@ fastled/site/build.py,sha256=2YKU_UWKlJdGnjdbAbaL0co6kceFMSTVYwH1KCmgPZA,13987
 fastled/site/examples.py,sha256=s6vj2zJc6BfKlnbwXr1QWY1mzuDBMt6j5MEBOWjO_U8,155
 fastled/test/can_run_local_docker_tests.py,sha256=LEuUbHctRhNNFWcvnz2kEGmjDJeXO4c3kNpizm3yVJs,400
 fastled/test/examples.py,sha256=GfaHeY1E8izBl6ZqDVjz--RHLyVR4NRnQ5pBesCFJFY,1673
-fastled-1.2.84.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.2.84.dist-info/METADATA,sha256=C02EyZg2HxA80WF2AV5tcPt7kxys7h9caPt_gYiEQCM,21940
-fastled-1.2.84.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-fastled-1.2.84.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.2.84.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
-fastled-1.2.84.dist-info/RECORD,,
+fastled-1.2.87.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.2.87.dist-info/METADATA,sha256=WLh9Pi4s5hfiXZRVV2jW7sK0oyxDq_yU3eb7ZeKdZAc,21940
+fastled-1.2.87.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+fastled-1.2.87.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.2.87.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
+fastled-1.2.87.dist-info/RECORD,,