fastled 1.2.82__py3-none-any.whl → 1.2.83__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.82"
+__version__ = "1.2.83"
 
 
 class Api:

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.dist-info → fastled-1.2.83.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-fastled/__init__.py,sha256=lMAq0izhqcQRZ-ei8s5OqQYEeOi5J6HlGvpxsICiQ4o,7044
+fastled/__init__.py,sha256=GFW1WwdYsAv_gygWIQ047oPRT6sjzh7WgDAYVNyInSo,7044
 fastled/app.py,sha256=0W8Mbplo5UCRzj7nMVgkmCBddQGufsUQjkUUT4pMp74,4611
 fastled/cli.py,sha256=FjVr31ht0UPlAcmX-84NwfAGMQHTkrCe4o744jCAxiw,375
 fastled/cli_test.py,sha256=qJB9yLRFR3OwOwdIWSQ0fQsWLnA37v5pDccufiP_hTs,512
@@ -17,7 +17,7 @@ fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
 fastled/print_filter.py,sha256=ZpebuqfWEraSBD3Dm0PVZhQVBnU_NSILniwBHwjC1qM,2342
 fastled/project_init.py,sha256=bBt4DwmW5hZkm9ICt9Qk-0Nr_0JQM7icCgH5Iv-bCQs,3984
 fastled/select_sketch_directory.py,sha256=-eudwCns3AKj4HuHtSkZAFwbnf005SNL07pOzs9VxnE,1383
-fastled/server_flask.py,sha256=IW8zgpv7qoV28qnd7BysnLnNmKHtT_JTRAjIpPUQw7U,6919
+fastled/server_flask.py,sha256=qPY72qJ4qOI3Llj3VG0CGvEnJ0ibMcprykAG6o9Sexk,9050
 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.82.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.2.82.dist-info/METADATA,sha256=Kl4WgIrfZKi7_wsVnVOfQ_dLRiWxSGbeDA16HJDsJB4,21940
-fastled-1.2.82.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-fastled-1.2.82.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.2.82.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
-fastled-1.2.82.dist-info/RECORD,,
+fastled-1.2.83.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.2.83.dist-info/METADATA,sha256=XPce-fPL-Jl0e7rpYRuf-JHiyIJZe44nZiARcxX4S8c,21940
+fastled-1.2.83.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+fastled-1.2.83.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.2.83.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
+fastled-1.2.83.dist-info/RECORD,,