fastled 1.2.82__tar.gz → 1.2.83__tar.gz

{fastled-1.2.82 → fastled-1.2.83}/PKG-INFO

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

{fastled-1.2.82 → fastled-1.2.83}/compiler/server.py

@@ -632,10 +632,10 @@ def source_file(filepath: str) -> FileResponse:
     return fr
 
 
-@app.get("/static/{file_path:path}")
+@app.get("/drawfsource/{file_path:path}")
 async def static_files(file_path: str) -> Response:
     """Serve static files."""
-    print(f"Endpoint accessed: /static/{file_path}")
+    print(f"Endpoint accessed: /drawfsource/{file_path}")
 
     # Check if path matches the pattern js/fastled/src/...
     if file_path.startswith("js/fastled/src/"):

{fastled-1.2.82 → fastled-1.2.83}/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.82"
+__version__ = "1.2.83"
 
 
 class Api:

{fastled-1.2.82 → fastled-1.2.83}/src/fastled/server_flask.py

@@ -5,6 +5,8 @@ from pathlib import Path
 import requests
 from livereload import Server
 
+_DRAWF_SOURCE_PREFIX = "drawfsource/js/fastled/src/"
+
 
 def _run_flask_server(
     fastled_js: Path,
@@ -22,7 +24,7 @@ def _run_flask_server(
         keyfile: Path to the SSL key file
     """
     try:
-        from flask import Flask, send_from_directory
+        from flask import Flask, Response, send_from_directory
 
         app = Flask(__name__)
 
@@ -35,13 +37,13 @@ def _run_flask_server(
         def serve_index():
             return send_from_directory(fastled_js, "index.html")
 
-        @app.route("/static/<path:path>")
-        def proxy_static(path):
-            """Proxy requests to /static/* to the compile server"""
-            from flask import Response, request
+        @app.route("/sourcefiles/<path:path>")
+        def serve_source_files(path):
+            """Proxy requests to /sourcefiles/* to the compile server"""
+            from flask import request
 
             # Forward the request to the compile server
-            target_url = f"http://localhost:{compile_server_port}/static/{path}"
+            target_url = f"http://localhost:{compile_server_port}/sourcefiles/{path}"
 
             # Forward the request with the same method, headers, and body
             resp = requests.request(
@@ -61,11 +63,50 @@ def _run_flask_server(
 
             return response
 
-        @app.route("/sourcefiles/<path:path>")
-        def serve_source_files(path):
-            """Proxy requests to /sourcefiles/* to the compile server"""
+        def handle_dwarfsource(path: str) -> Response:
+            """Handle requests to /drawfsource/js/fastled/src/"""
+            from flask import request
+
+            print("\n##################################")
+            print(f"# Serving source file /drawfsource/ {path}")
+            print("##################################\n")
+
+            if not path.startswith(_DRAWF_SOURCE_PREFIX):
+                # unexpected
+                print(f"Unexpected path: {path}")
+                return Response("Malformed path", status=400)
+
+            path = path.replace("drawfsource/js/fastled/src/", "")
+
+            # Forward the request to the compile server
+            target_url = f"http://localhost:{compile_server_port}/sourcefiles/{path}"
+
+            # Forward the request with the same method, headers, and body
+            resp = requests.request(
+                method=request.method,
+                url=target_url,
+                headers={key: value for key, value in request.headers if key != "Host"},
+                data=request.get_data(),
+                cookies=request.cookies,
+                allow_redirects=True,
+                stream=False,
+            )
+
+            # Create a Flask Response object from the requests response
+            response = Response(
+                resp.raw.read(), status=resp.status_code, headers=dict(resp.headers)
+            )
+
+            return response
+
+        def handle_sourcefile(path: str) -> Response:
+            """Handle requests to /sourcefiles/*"""
             from flask import Response, request
 
+            print("\n##################################")
+            print(f"# Serving source file /sourcefiles/ {path}")
+            print("##################################\n")
+
             # Forward the request to the compile server
             target_url = f"http://localhost:{compile_server_port}/sourcefiles/{path}"
 
@@ -87,8 +128,12 @@ def _run_flask_server(
 
             return response
 
-        @app.route("/<path:path>")
-        def serve_files(path):
+        def handle_local_file_fetch(path: str) -> Response:
+
+            print("\n##################################")
+            print(f"# Servering generic file {path}")
+            print("##################################\n")
+
             response = send_from_directory(fastled_js, path)
             # Some servers don't set the Content-Type header for a bunch of files.
             if path.endswith(".js"):
@@ -120,6 +165,16 @@ def _run_flask_server(
             response.headers["Expires"] = "0"
             return response
 
+        @app.route("/<path:path>")
+        def serve_files(path: str):
+
+            if path.startswith("drawfsource/"):
+                return handle_dwarfsource(path)
+            elif path.startswith("sourcefiles/"):
+                return handle_sourcefile(path)
+            else:
+                return handle_local_file_fetch(path)
+
         server = Server(app.wsgi_app)
         # Watch index.html for changes
         server.watch(str(fastled_js / "index.html"))

{fastled-1.2.82 → fastled-1.2.83}/src/fastled.egg-info/PKG-INFO

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

{fastled-1.2.82 → fastled-1.2.83}/src/fastled.egg-info/SOURCES.txt

@@ -111,7 +111,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_fastled_source_get.py
+tests/unit/test_fetch_source_files.py
 tests/unit/test_filechanger.py
 tests/unit/test_http_server.py
 tests/unit/test_print_filter.py

fastled-1.2.82/tests/unit/test_fastled_source_get.py → fastled-1.2.83/tests/unit/test_fetch_source_files.py

@@ -67,7 +67,16 @@ class FetchSourceFileTester(unittest.TestCase):
 
             resp = httpx.get(
                 f"http://localhost:{http_port}/sourcefiles/FastLED.h",
-                timeout=10,
+                timeout=100,
+            )
+            if resp.status_code != 200:
+                raise Exception(f"Failed to fetch source file: {resp.status_code}")
+
+            # 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"
+            resp = httpx.get(
+                url,
+                timeout=100,
             )
             if resp.status_code != 200:
                 raise Exception(f"Failed to fetch source file: {resp.status_code}")