fastled 1.3.18__tar.gz → 1.3.21__tar.gz

{fastled-1.3.18 → fastled-1.3.21}/Dockerfile

@@ -3,14 +3,12 @@
 FROM niteris/fastled-wasm-compiler:latest
 
 
-COPY requirements.testing.txt /install/requirements.txt
-# Extract fastled-wasm-server version from requirements.txt
-RUN \
-    grep -oP '(?<=fastled-wasm-server[<>=!]=?)[^ \n#]+' /install/requirements.txt > /install/version.txt && \
-    cat /install/version.txt > /install/requirements.txt && \
-    uv pip install --system -r /install/requirements.txt --refresh || \
-    uv pip install --system -r /install/requirements.txt --refresh || \
-    uv pip install --system -r /install/requirements.txt --refresh
+COPY requirements.docker.txt /install/requirements.docker.txt
+
+# Fresh packages need multiple hits to bust through stale cache... and this is fast.
+RUN uv pip install --system -r /install/requirements.docker.txt --refresh  || \
+    uv pip install --system -r /install/requirements.docker.txt --refresh || \
+    uv pip install --system -r /install/requirements.docker.txt --refresh
 
 # FIRST PRE-WARM CYCLE and initial setup: Download the fastled repo from the github and pre-warm the cache with a compilation.
 # This is by far the most expensive part of the build, because platformio needs to download initial tools. This

{fastled-1.3.18 → fastled-1.3.21}/PKG-INFO

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

{fastled-1.3.18 → fastled-1.3.21}/install

@@ -19,10 +19,9 @@ fi
 uv venv --python 3.11 --seed
 uv run pip install -e .
 
-# If requirements.testing.txt exists, then install it
-if [[ -f requirements.testing.txt ]]; then
-  uv run pip install -r requirements.testing.txt
-fi
+uv run pip install -r requirements.testing.txt
+uv run pip install -r requirements.docker.txt
+
 
 # If activate exists, delete it
 if [[ -f activate ]]; then

fastled-1.3.21/requirements.docker.txt

@@ -0,0 +1 @@
+fastled-wasm-server>=1.0.74

{fastled-1.3.18 → fastled-1.3.21}/requirements.testing.txt

@@ -6,4 +6,3 @@ ruff
 pytest-xdist
 pyinstaller
 pyright
-fastled-wasm-server>=1.0.70

{fastled-1.3.18 → fastled-1.3.21}/src/fastled/__version__.py

@@ -1,6 +1,6 @@
 # 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.3.18"
+__version__ = "1.3.21"
 
 __version_url_latest__ = "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/src/fastled/__version__.py"

{fastled-1.3.18 → fastled-1.3.21}/src/fastled/server_flask.py

@@ -28,16 +28,19 @@ else:
 
 def _is_dwarf_source(path: str) -> bool:
     """Check if the path is a dwarf source file."""
+    logger.debug(f"_is_dwarf_source called with path: {path}")
     if "dwarfsource" in path:
         logger.debug(f"Path '{path}' contains 'dwarfsource'")
         return True
-    # Check if the path starts with "fastledsource/" or "sketchsource/"
-    return (
-        path.startswith("fastledsource/")
-        or path.startswith("sketchsource/")
-        or path.startswith("/dwarfsource/")
-        or path.startswith("dwarfsource/")
-    )
+    _is_dwarf_source = False
+    for p in ["fastledsource", "sketchsource", "dwarfsource", "drawfsource"]:
+        if p in path:
+            _is_dwarf_source = True
+            logger.debug(f"Path '{p}' contains '{path}'")
+            break
+    if not _is_dwarf_source:
+        logger.debug(f"Path '{path}' is not a dwarf source file")
+    return _is_dwarf_source
 
 
 def _run_flask_server(
@@ -139,70 +142,15 @@ def _run_flask_server(
                 logger.error(f"Error forwarding request: {e}", exc_info=True)
                 return Response(f"Error: {str(e)}", status=500)
 
-        def handle_fastledsource(path: str) -> Response:
-            """Handle requests to
-            /fastledsource/js/fastledsource/git/fastled/src/
-            or
-            /sketchsource/js/src/Blink.ino
-
-            The names are a bit mangled due to the way C++ prefixing works near the root directory.
-            """
-            from flask import request
-
-            start_time = time.time()
-            logger.info(f"Processing request: {request.method} {request.url}")
-            # Forward the request to the compile server
-            target_url = f"http://localhost:{compile_server_port}/dwarfsource/{path}"
-            logger.info(f"Requesting: {target_url}")
-            logger.info(f"Processing dwarfsource request for {path}")
-
-            # Log request headers
-            request_headers = {
-                key: value for key, value in request.headers if key != "Host"
-            }
-            logger.debug(f"Request headers: {request_headers}")
-
-            try:
-                # Forward the request with the same method, headers, and body
-                with httpx.Client() as client:
-                    resp = client.request(
-                        method=request.method,
-                        url=target_url,
-                        headers=request_headers,
-                        content=request.get_data(),
-                        cookies=request.cookies,
-                        follow_redirects=True,
-                    )
-
-                logger.info(f"Response status: {resp.status_code}")
-                logger.debug(f"Response headers: {dict(resp.headers)}")
-
-                # Create a Flask Response object from the httpx response
-                payload = resp.content
-                assert isinstance(payload, bytes)
-
-                # Check if the payload is empty
-                if len(payload) == 0:
-                    logger.error("Empty payload received from compile server")
-                    return Response("Empty payload", status=400)
-
-                response = Response(
-                    payload, status=resp.status_code, headers=dict(resp.headers)
-                )
-
-                elapsed_time = time.time() - start_time
-                logger.info(f"Request completed in {elapsed_time:.3f} seconds")
-
-                return response
-
-            except Exception as e:
-                logger.error(f"Error handling dwarfsource request: {e}", exc_info=True)
-                return Response(f"Error: {str(e)}", status=500)
-
-        def handle_sourcefile(path: str) -> Response:
+        def handle_dwarfsource(path: str) -> Response:
             """Handle requests to /sourcefiles/*"""
             from flask import Response, request
 
+            # Request body should be
+            # {
+            #     "path": "string"
+            # }
+
             start_time = time.time()
             logger.info("\n##################################")
             logger.info(f"# Serving source file /sourcefiles/ {path}")
@@ -211,7 +159,7 @@ def _run_flask_server(
             logger.info(f"Processing sourcefile request for {path}")
 
             # Forward the request to the compile server
-            target_url = f"http://localhost:{compile_server_port}/{path}"
+            target_url = f"http://localhost:{compile_server_port}/dwarfsource"
             logger.info(f"Forwarding to: {target_url}")
 
             # Log request headers
@@ -220,14 +168,18 @@ def _run_flask_server(
             }
             logger.debug(f"Request headers: {request_headers}")
 
+            body: dict[str, str] = {
+                "path": path,
+            }
+
             try:
                 # Forward the request with the same method, headers, and body
                 with httpx.Client() as client:
                     resp = client.request(
-                        method=request.method,
+                        method="POST",
                         url=target_url,
                         headers=request_headers,
-                        content=request.get_data(),
+                        json=body,
                         cookies=request.cookies,
                         follow_redirects=True,
                     )
@@ -341,11 +293,8 @@ def _run_flask_server(
                 is_debug_src_code_request = _is_dwarf_source(path)
                 logger.info(f"is debug_src_code_request: {is_debug_src_code_request}")
                 if is_debug_src_code_request:
-                    logger.info(f"Handling as drawfsource: {path}")
-                    return handle_fastledsource(path)
-                elif path.startswith("sourcefiles/"):
-                    logger.info(f"Handling as sourcefiles: {path}")
-                    return handle_sourcefile(path)
+                    logger.info(f"Handling as dwarf source file request: {path}")
+                    return handle_dwarfsource(path)
                 else:
                     logger.info(f"Handling as local file: {path}")
                     return handle_local_file_fetch(path)

{fastled-1.3.18 → fastled-1.3.21}/src/fastled/util.py

@@ -19,7 +19,8 @@ def banner_string(msg: str) -> str:
     for line in lines:
         out.append(f"# {line} " + " " * (max_length - len(line)) + "#")
     out.append(border)
-    return "\n".join(out)
+    outstr = "\n".join(out)
+    return f"\n{outstr}\n"
 
 
 def print_banner(msg: str) -> None:

{fastled-1.3.18 → fastled-1.3.21}/src/fastled/web_compile.py

@@ -182,7 +182,7 @@ def _banner(msg: str) -> str:
 
     # Add the bottom border
     banner += "#" * width + "\n"
-    return banner
+    return f"\n{banner}\n"
 
 
 def _print_banner(msg: str) -> None:

{fastled-1.3.18 → fastled-1.3.21}/src/fastled.egg-info/PKG-INFO

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

{fastled-1.3.18 → fastled-1.3.21}/src/fastled.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ install
 install_linux.sh
 lint
 pyproject.toml
+requirements.docker.txt
 requirements.testing.txt
 setup.py
 test

{fastled-1.3.18 → fastled-1.3.21}/tests/unit/test_banner_string.py

@@ -5,10 +5,10 @@ from fastled.util import banner_string
 _MSG = "Hello, World!\nsecond line"
 
 _EXPECTED: str = (
-    "#################\n"
+    "\n#################\n"
     "# Hello, World! #\n"
     "# second line   #\n"
-    "#################"
+    "#################\n"
 )
 
 

{fastled-1.3.18 → fastled-1.3.21}/tests/unit/test_debug_fetch_source_files.py

@@ -1,14 +1,14 @@
 import os
-
-os.environ["FLASK_SERVER_LOGGING"] = "1"
-
 import time
 import unittest
 import warnings
 from pathlib import Path
+from urllib.parse import urlparse
 
 import httpx
 
+os.environ["FLASK_SERVER_LOGGING"] = "1"
+
 from fastled import Api, LiveClient
 
 HERE = Path(__file__).parent
@@ -18,10 +18,13 @@ TEST_INO_WASM = HERE / "test_ino" / "wasm"
 _ENABLED = True
 
 _DWARF_SRC_EXAMPLE1 = "http://localhost:{http_port}/dwarfsource/fastledsource/js/src/fastledsource/git/fastled/src/FastLED.h"
-
+_DWARF_SRC_EXAMPLE2 = (
+    "http://localhost:{http_port}/dwarfsource/js/dwarfsource/git/fastled/src/chipsets.h"
+)
 
 _DWARF_SRC_EXAMPLES = [
-    _DWARF_SRC_EXAMPLE1,
+    # _DWARF_SRC_EXAMPLE1,
+    _DWARF_SRC_EXAMPLE2
 ]
 
 
@@ -84,13 +87,15 @@ class FetchSourceFileTester(unittest.TestCase):
             if content_length == 0:
                 raise Exception("Content-Length is 0")
 
-            backend_url = (
-                backend_host
-                + "/dwarfsource"
-                + "/fastledsource/git/fastled/src/FastLED.h"
-            )
-            resp = httpx.get(
+            backend_url = backend_host + "/dwarfsource"
+
+            body: dict[str, str] = {
+                "path": "fastledsource/git/fastled/src/FastLED.h",
+            }
+
+            resp = httpx.post(
                 backend_url,
+                json=body,
                 timeout=100,
             )
             if resp.status_code != 200:
@@ -108,11 +113,19 @@ class FetchSourceFileTester(unittest.TestCase):
                 self.assertTrue(resp.status_code == 200, resp.status_code)
                 content_length = int(resp.headers["Content-Length"])
                 self.assertTrue(content_length > 0, "Content-Length is 0")
-                backend_url = (
-                    backend_host + "/dwarfsource/" + "/".join(url.split("/")[1:])
-                )
-                resp = httpx.get(
+
+                parsed_url = urlparse(url)
+                # Extract the path and reconstruct the backend URL
+                # print(parsed_url)
+
+                body: dict[str, str] = {
+                    "path": parsed_url.path.lstrip("/"),  # Remove leading slash
+                }
+
+                backend_url = backend_host + "/dwarfsource"
+                resp = httpx.post(
                     backend_url,
+                    json=body,
                     timeout=100,
                 )
                 if resp.status_code != 200:
@@ -125,8 +138,8 @@ class FetchSourceFileTester(unittest.TestCase):
             # Work in progress: get system include files.
             # 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"
+            # # error dwarfsource/js/drawfsour
+            # url = f"http://localhost:{http_port}/dwarfsource/js/dwarfsource/emsdk/upstream/emscripten/cache/sysroot/include/ctype.h"
             # resp = httpx.get(
             #     url,
             #     timeout=100,

{fastled-1.3.18 → fastled-1.3.21}/tests/unit/test_http_server.py

@@ -2,6 +2,7 @@
 Unit test file.
 """
 
+import os
 import random
 import time
 import unittest
@@ -9,6 +10,8 @@ from pathlib import Path
 
 import httpx
 
+os.environ["FLASK_SERVER_LOGGING"] = "1"
+
 from fastled import Test
 
 HERE = Path(__file__).parent

{fastled-1.3.18 → fastled-1.3.21}/tests/unit/test_ino/bad_platformio/platformio.ini

@@ -63,7 +63,7 @@ build_flags =
     ${env:wasm-base.build_flags}
     -g3
     -gsource-map
-    -ffile-prefix-map=/=drawfsource/
+    -ffile-prefix-map=/=dwarfsource/
     -fsanitize=address
     -fsanitize=undefined
     -fno-inline