fastled 1.2.93__tar.gz → 1.2.94__tar.gz

{fastled-1.2.93 → fastled-1.2.94}/Dockerfile

@@ -16,33 +16,33 @@ RUN echo "force update4"
 ARG FASTLED_BUILD_DAY=echo $(date +'%Y-%m-%d')
 ENV FASTLED_BUILD_DAY=${FASTLED_BUILD_DAY}
 
-ARG FASTLED_VERSION=master
-ENV FASTLED_VERSION=${FASTLED_VERSION}
-RUN mkdir -p /js/fastled && \
-    rsync -a /git/fastled/ /js/fastled/ --exclude='.git'
+# ARG FASTLED_VERSION=master
+# ENV FASTLED_VERSION=${FASTLED_VERSION}
+# RUN mkdir -p /js/fastled && \
+#     rsync -a /git/fastled/ /js/fastled/ --exclude='.git'
 
 # Create symlinks for wasm platform files.
 COPY compiler/init_runtime.py /js/init_runtime.py
-COPY compiler/prewarm.sh /js/prewarm.sh
+#COPY compiler/prewarm.sh /js/prewarm.sh
 
 WORKDIR /js
 
-ARG NO_PREWARM=0
-ENV NO_PREWARM=${NO_PREWARM}
+#ARG NO_PREWARM=0
+#ENV NO_PREWARM=${NO_PREWARM}
 
-RUN python /js/init_runtime.py || true
+#RUN python /js/init_runtime.py || true
 
 
 # First pre-warm cycle - always do it as part of the build.
-RUN mkdir -p /logs
+# RUN mkdir -p /logs
 
 # Force a build if the compiler flags change.
-COPY compiler/CMakeLists.txt /trash/CMakeLists.txt
-RUN rm -rf /trash
+#COPY compiler/CMakeLists.txt /trash/CMakeLists.txt
+#RUN rm -rf /trash
 
-RUN chmod +x /js/prewarm.sh && \
-    cat /js/prewarm.sh >> /logs/prewarm.log.0
-RUN /js/prewarm.sh --force >> /logs/prewarm.log.1 || true
+#RUN chmod +x /js/prewarm.sh && \
+#    cat /js/prewarm.sh >> /logs/prewarm.log.0
+#RUN /js/prewarm.sh --force >> /logs/prewarm.log.1 || true
 
 
 
@@ -69,12 +69,12 @@ RUN chmod +x /entrypoint.sh && dos2unix /entrypoint.sh
 # now sync local to the source directory.
 # RUN rsync -av /host/fastled/ /js/fastled/ && rm -rf /host/fastled
 
-RUN python /js/init_runtime.py || true
+# RUN python /js/init_runtime.py || true
 
 
 # SECOND PRE-WARM CYCLE: Copy the fastled repo from the host machine and pre-warm the cache with that compilation. This will
 # be much quicker than the first pre-warm cycle.
-RUN /js/prewarm.sh --force > /logs/prewarm.log.2 || true
+# RUN /js/prewarm.sh --force > /logs/prewarm.log.2 || true
 
 # Now timestamp the image and store it at the end of the build.
 RUN date > /image_timestamp.txt

{fastled-1.2.93 → fastled-1.2.94}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.2.93
+Version: 1.2.94
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -20,7 +20,7 @@ Requires-Dist: progress>=1.6
 Requires-Dist: watchfiles>=1.0.5
 Requires-Dist: Flask>=3.0.0
 Requires-Dist: livereload
-Requires-Dist: fastled-wasm-server>=1.0.6
+Requires-Dist: fastled-wasm-server>=1.0.13
 Dynamic: home-page
 Dynamic: license-file
 Dynamic: maintainer

{fastled-1.2.93 → fastled-1.2.94}/compiler/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
     "disklru==2.0.0",
     "psutil==6.1.1",
     "wormhole-tx",
-    "fastled-wasm-server>=1.0.6",
+    "fastled-wasm-server>=1.0.13",  # Also versions fastled-wasm-compiler dependency.
 ]
 
 [tool.setuptools]

{fastled-1.2.93 → fastled-1.2.94}/pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
     "Flask>=3.0.0",
     "livereload",
     ###### WASM SERVER ######
-    "fastled-wasm-server>=1.0.6",  # This version can float upwards, while the docker is pinned.
+    "fastled-wasm-server>=1.0.13",  # Enforced by unit test to match project <--> docker.
 ]
 
 dynamic = ["version"]

{fastled-1.2.93 → fastled-1.2.94}/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.93"
+__version__ = "1.2.94"
 
 
 class Api:

{fastled-1.2.93 → fastled-1.2.94}/src/fastled/server_flask.py

@@ -23,9 +23,22 @@ else:
     logger = logging.getLogger("flask_server")
     logger.disabled = True
 
-_DRAWF_SOURCE_FASTLED = "drawfsource/js/fastled/src/"
+_DRAWF_SOURCE_FASTLED = "drawfsource/src/drawfsource/git/fastled/src"
 _DRAWF_SOURCE_EMSDK = "drawfsource/js/drawfsource/emsdk/"
 
+# Mirrors what's on the server.
+_PATTERNS_FASTLED_SRC = [
+    "drawfsource/js/src/drawfsource/git/fastled/src/",
+    "drawfsource/js/drawfsource/headers/",
+]
+
+
+def _resolve_fastled_src(drawfsource: str) -> str | None:
+    for pattern in _PATTERNS_FASTLED_SRC:
+        if drawfsource.startswith(pattern):
+            return drawfsource[len(pattern) :]
+    return None
+
 
 def _run_flask_server(
     fastled_js: Path,
@@ -140,21 +153,14 @@ def _run_flask_server(
                 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)
-
-            # Weird magic being played with these paths, it's beyond me.
-            if path.startswith(_DRAWF_SOURCE_FASTLED):
-                path = path[len("/drawfsource") :]
+            resolved: str | None = _resolve_fastled_src(path)
+            if resolved is None:
+                # If the path does not match the expected patterns, return a 404
+                logger.error(f"Path does not match expected patterns: {path}")
+                return Response("Not Found", status=404)
 
             # Forward the request to the compile server
-            target_url = f"http://localhost:{compile_server_port}/drawfsource/{path}"
+            target_url = f"http://localhost:{compile_server_port}/sourcefiles/{path}"
             logger.info(f"Requesting: {target_url}")
             logger.info(f"Processing dwarfsource request for {path}")
 

{fastled-1.2.93 → fastled-1.2.94}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.2.93
+Version: 1.2.94
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -20,7 +20,7 @@ Requires-Dist: progress>=1.6
 Requires-Dist: watchfiles>=1.0.5
 Requires-Dist: Flask>=3.0.0
 Requires-Dist: livereload
-Requires-Dist: fastled-wasm-server>=1.0.6
+Requires-Dist: fastled-wasm-server>=1.0.13
 Dynamic: home-page
 Dynamic: license-file
 Dynamic: maintainer

{fastled-1.2.93 → fastled-1.2.94}/src/fastled.egg-info/requires.txt

@@ -8,4 +8,4 @@ progress>=1.6
 watchfiles>=1.0.5
 Flask>=3.0.0
 livereload
-fastled-wasm-server>=1.0.6
+fastled-wasm-server>=1.0.13

{fastled-1.2.93 → fastled-1.2.94}/tests/unit/test_fetch_source_files.py

@@ -11,7 +11,14 @@ HERE = Path(__file__).parent
 TEST_INO_WASM = HERE / "test_ino" / "wasm"
 
 # New refactor has broken this test. Good news, we got the sketch to output debug symbols!!!!!!
-_ENABLED = False
+_ENABLED = True
+
+_DWARF_SRC_EXAMPLE = (
+    "http://localhost:{http_port}/drawfsource/src/drawfsource/git/fastled/src/FastLED.h"
+)
+
+
+# _DWARF_SRC_EXAMPLE_SKETCH = "http://localhost:{http_port}/drawfsource/js/src/src/wave.cpp"
 
 
 def _enabled() -> bool:
@@ -45,6 +52,9 @@ class FetchSourceFileTester(unittest.TestCase):
     )
     def test_backend_server_for_src_file_fetch(self) -> None:
         """Tests that embedded data is round tripped correctly."""
+        # Todo: make this only run on a local build. Otherwise there are sync issues
+        # with the docker version of this app and will generate false positives until
+        # the docker version is updated - Frustrating.
         with Api.server() as server:
             resp = server.fetch_source_file("FastLED.h")
             if isinstance(resp, Exception):
@@ -79,11 +89,12 @@ class FetchSourceFileTester(unittest.TestCase):
                 raise Exception("Content-Length is 0")
 
             # now get something similar at static/js/fastled/src/platforms/wasm/js.cpp
-            url = f"http://localhost:{http_port}/drawfsource/js/fastled/src/FastLED.h"
+            url = _DWARF_SRC_EXAMPLE.format(http_port=http_port)
             resp = httpx.get(
                 url,
                 timeout=100,
             )
+            self.assertTrue(resp.status_code == 200, resp.status_code)
 
             # Work in progress: get system include files.
             # if resp.status_code != 200: