fastled 1.2.84__tar.gz → 1.2.86__tar.gz

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

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

fastled-1.2.86/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.86}/compiler/server.py

@@ -439,7 +439,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 +666,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.86}/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.86"
 
 
 class Api:

{fastled-1.2.84 → fastled-1.2.86}/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.86}/src/fastled.egg-info/PKG-INFO

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

{fastled-1.2.84 → fastled-1.2.86}/tests/unit/test_fetch_source_files.py

@@ -53,7 +53,7 @@ class FetchSourceFileTester(unittest.TestCase):
         "Skipping test because either this is on non-Linux system on github or embedded data is disabled",
     )
     def test_http_server_for_fetch_redirect(self) -> None:
-        """Tests that embedded data is round tripped correctly."""
+        """Tests that we can convert the file paths from emscripten debugging (dwarf) to the actual file paths."""
         http_port = 8932
         client: LiveClient = Api.live_client(
             sketch_directory=TEST_INO_WASM,
@@ -83,6 +83,14 @@ class FetchSourceFileTester(unittest.TestCase):
             )
             if resp.status_code != 200:
                 raise Exception(f"Failed to fetch source file: {resp.status_code}")
+            # error drawfsource/js/drawfsour
+            url = f"http://localhost:{http_port}/drawfsource/js/drawfsource/emsdk/upstream/emscripten/cache/sysroot/include/ctype.h"
+            resp = httpx.get(
+                url,
+                timeout=100,
+            )
+            if resp.status_code != 200:
+                raise Exception(f"Failed to fetch source file: {resp.status_code}")
 
 
 if __name__ == "__main__":

fastled-1.2.84/build_local_docker.py

@@ -1,4 +0,0 @@
-import os
-
-os.system("docker compose down --remove-orphans --rmi all")
-os.system("docker compose build")