fastled 1.2.79__py3-none-any.whl → 1.2.81__py3-none-any.whl

fastled/__init__.py

@@ -9,12 +9,12 @@ from .compile_server import CompileServer
 from .live_client import LiveClient
 from .settings import DOCKER_FILE, IMAGE_NAME
 from .site.build import build
-from .types import BuildMode, CompileResult, CompileServerError
+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.79"
+__version__ = "1.2.81"
 
 
 class Api:
@@ -194,14 +194,19 @@ class Test:
     def spawn_http_server(
         directory: Path | str = Path("."),
         port: int | None = None,
+        compile_server_port: int | None = None,
         open_browser: bool = True,
     ) -> Process:
         from fastled.open_browser import open_browser_process
 
+        compile_server_port = compile_server_port or -1
         if isinstance(directory, str):
             directory = Path(directory)
         proc: Process = open_browser_process(
-            directory, port=port, open_browser=open_browser
+            directory,
+            port=port,
+            compile_server_port=compile_server_port,
+            open_browser=open_browser,
         )
         return proc
 
@@ -213,5 +218,6 @@ __all__ = [
     "CompileResult",
     "CompileServerError",
     "BuildMode",
+    "FileResponse",
     "DOCKER_FILE",
 ]

fastled/client_server.py

@@ -188,6 +188,15 @@ def run_client(
         return DEFAULT_URL
 
     url = get_url()
+    # parse out the port from the url
+    # use a standard host address parser to grab it
+    import urllib.parse
+
+    parsed_url = urllib.parse.urlparse(url)
+    if parsed_url.port is not None:
+        port = parsed_url.port
+    else:
+        port = 80
 
     try:
 
@@ -214,7 +223,9 @@ def run_client(
 
         browser_proc: Process | None = None
         if open_web_browser:
-            browser_proc = open_browser_process(directory / "fastled_js")
+            browser_proc = open_browser_process(
+                directory / "fastled_js", compile_server_port=port
+            )
         else:
             print("\nCompilation successful.")
             if compile_server:

fastled/compile_server.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from fastled.types import BuildMode, CompileResult, Platform
+from fastled.types import BuildMode, CompileResult, FileResponse, Platform
 
 
 class CompileServer:
@@ -53,6 +53,10 @@ class CompileServer:
 
         project_init(example=example, outputdir=outputdir)
 
+    def fetch_source_file(self, filepath: str) -> FileResponse | Exception:
+        """Get the source file from the server."""
+        return self.impl.fetch_source_file(filepath)
+
     @property
     def name(self) -> str:
         return self.impl.container_name

fastled/compile_server_impl.py

@@ -17,7 +17,7 @@ from fastled.docker_manager import (
 )
 from fastled.settings import DEFAULT_CONTAINER_NAME, IMAGE_NAME, SERVER_PORT
 from fastled.sketch import looks_like_fastled_repo
-from fastled.types import BuildMode, CompileResult, CompileServerError
+from fastled.types import BuildMode, CompileResult, CompileServerError, FileResponse
 
 SERVER_OPTIONS = [
     "--allow-shutdown",  # Allow the server to be shut down without a force kill.
@@ -204,6 +204,29 @@ class CompileServerImpl:
                 return False
         return False
 
+    def fetch_source_file(self, filepath: str) -> FileResponse | Exception:
+        """Get the source file from the server."""
+        if not self._port:
+            raise RuntimeError("Server has not been started yet")
+        try:
+            httpx_client = httpx.Client()
+            url = f"http://localhost:{self._port}/sourcefiles/{filepath}"
+            response = httpx_client.get(url, follow_redirects=True)
+            if response.status_code == 200:
+                content = response.text
+                mimetype: str = response.headers.get("Content-Type", "text/plain")
+                return FileResponse(
+                    content=content,
+                    mimetype=mimetype,
+                    filename=filepath,
+                )
+            else:
+                return CompileServerError(
+                    f"Error fetching file {filepath}: {response.status_code}"
+                )
+        except httpx.RequestError as e:
+            return CompileServerError(f"Error fetching file {filepath}: {e}")
+
     def _start(self) -> int:
         print("Compiling server starting")
 

fastled/open_browser.py

@@ -14,8 +14,7 @@ PYTHON_EXE = sys.executable
 
 
 def _open_http_server_subprocess(
-    fastled_js: Path,
-    port: int,
+    fastled_js: Path, port: int, compile_server_port: int
 ) -> None:
     print("\n################################################################")
     print(f"# Opening browser to {fastled_js} on port {port}")
@@ -30,6 +29,8 @@ def _open_http_server_subprocess(
             str(fastled_js),
             "--port",
             str(port),
+            "--compile-server-port",
+            str(compile_server_port),
         ]
         # Pass SSL flags if available
         if ssl:
@@ -89,6 +90,7 @@ def wait_for_server(port: int, timeout: int = 10) -> None:
 
 def open_browser_process(
     fastled_js: Path,
+    compile_server_port: int,
     port: int | None = None,
     open_browser: bool = True,
 ) -> Process:
@@ -100,7 +102,7 @@ def open_browser_process(
 
     proc = Process(
         target=_open_http_server_subprocess,
-        args=(fastled_js, port),
+        args=(fastled_js, port, compile_server_port),
         daemon=True,
     )
     proc.start()

fastled/server_flask.py

@@ -2,12 +2,14 @@ import argparse
 from multiprocessing import Process
 from pathlib import Path
 
+import requests
 from livereload import Server
 
 
 def _run_flask_server(
     fastled_js: Path,
     port: int,
+    compile_server_port: int,
     certfile: Path | None = None,
     keyfile: Path | None = None,
 ) -> None:
@@ -27,10 +29,38 @@ def _run_flask_server(
         # Must be a full path or flask will fail to find the file.
         fastled_js = fastled_js.resolve()
 
+        print(f"Compile server port is at {compile_server_port}")
+
         @app.route("/")
         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
+
+            # Forward the request to the compile server
+            target_url = f"http://localhost:{compile_server_port}/static/{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
+
         @app.route("/<path:path>")
         def serve_files(path):
             response = send_from_directory(fastled_js, path)
@@ -83,11 +113,15 @@ def _run_flask_server(
 
 
 def run(
-    port: int, cwd: Path, certfile: Path | None = None, keyfile: Path | None = None
+    port: int,
+    cwd: Path,
+    compile_server_port: int,
+    certfile: Path | None = None,
+    keyfile: Path | None = None,
 ) -> None:
     """Run the Flask server."""
     try:
-        _run_flask_server(cwd, port, certfile, keyfile)
+        _run_flask_server(cwd, port, compile_server_port, certfile, keyfile)
         import warnings
 
         warnings.warn("Flask server has stopped")
@@ -128,15 +162,15 @@ def parse_args() -> argparse.Namespace:
 
 def run_flask_server_process(
     port: int,
-    cwd: Path | None = None,
+    cwd: Path,
+    compile_server_port: int,
     certfile: Path | None = None,
     keyfile: Path | None = None,
 ) -> Process:
     """Run the Flask server in a separate process."""
-    cwd = cwd or Path(".")
     process = Process(
         target=run,
-        args=(port, cwd, certfile, keyfile),
+        args=(port, cwd, compile_server_port, certfile, keyfile),
     )
     process.start()
     return process

fastled/server_start.py

@@ -9,7 +9,11 @@ from fastled.server_flask import run_flask_server_process
 
 
 def run_server_process(
-    port: int, cwd: Path, certfile: Path | None = None, keyfile: Path | None = None
+    port: int,
+    cwd: Path,
+    compile_server_port: int,
+    certfile: Path | None = None,
+    keyfile: Path | None = None,
 ) -> Process:
     """Run the server in a separate process."""
     if True:
@@ -17,6 +21,7 @@ def run_server_process(
         process = run_flask_server_process(
             port=port,
             cwd=cwd,
+            compile_server_port=compile_server_port,
             certfile=certfile,
             keyfile=keyfile,
         )
@@ -45,19 +50,18 @@ def get_asset_path(filename: str) -> Path | None:
 def start_process(
     path: Path,
     port: int,
-    certfile: Path | None = None,
-    keyfile: Path | None = None,
+    compile_server_port: int,
+    certfile: Path | None = None,  # reserved for future use
+    keyfile: Path | None = None,  # reserved for future use
 ) -> Process:
     """Run the server, using package assets if explicit paths are not provided"""
     # Use package resources if no explicit path
-    if certfile is None:
-        certfile = get_asset_path("localhost.pem")
-    if keyfile is None:
-        keyfile = get_asset_path("localhost-key.pem")
 
     # _run_flask_server(path, port, certfile, keyfile)
     # run_fastapi_server_process(port=port, path=path, certfile=certfile, keyfile=keyfile)
-    proc = run_server_process(port=port, cwd=path)
+    proc = run_server_process(
+        port=port, cwd=path, compile_server_port=compile_server_port
+    )
     # try:
     #     proc.join()
     # except KeyboardInterrupt:
@@ -71,6 +75,7 @@ def start_process(
 class Args:
     fastled_js: Path
     port: int
+    compile_server_port: int
     cert: Path | None
     key: Path | None
 
@@ -89,6 +94,12 @@ def parse_args() -> Args:
         default=5500,
         help="Port to run the server on (default: 5500)",
     )
+    parser.add_argument(
+        "--compile-server-port",
+        type=int,
+        required=True,
+        help="Used to forward requests to the compile server",
+    )
     parser.add_argument(
         "--cert", type=Path, help="(Optional) Path to SSL certificate (PEM format)"
     )
@@ -99,6 +110,7 @@ def parse_args() -> Args:
     out: Args = Args(
         fastled_js=args.fastled_js,
         port=args.port,
+        compile_server_port=args.compile_server_port,
         cert=args.cert,
         key=args.key,
     )
@@ -116,6 +128,7 @@ def main() -> None:
     proc = start_process(
         path=fastled_js,
         port=port,
+        compile_server_port=args.compile_server_port,
         certfile=cert,
         keyfile=key,
     )

fastled/types.py

@@ -151,3 +151,12 @@ class Platform(Enum):
             raise ValueError(
                 f"Platform must be one of {valid_modes}, got {platform_str}"
             )
+
+
+@dataclass
+class FileResponse:
+    """File response from the server."""
+
+    filename: str
+    content: str
+    mimetype: str

{fastled-1.2.79.dist-info → fastled-1.2.81.dist-info}/METADATA

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

{fastled-1.2.79.dist-info → fastled-1.2.81.dist-info}/RECORD

@@ -1,17 +1,17 @@
-fastled/__init__.py,sha256=6fYsskRgPisOqiDsZFYXhWAA0txnvkMGffOfCtAXB1I,6680
+fastled/__init__.py,sha256=E0yN78HV0eXNtDsCcsGLoJTTdhAaXlsN6B17h7nzmjc,6896
 fastled/app.py,sha256=0W8Mbplo5UCRzj7nMVgkmCBddQGufsUQjkUUT4pMp74,4611
 fastled/cli.py,sha256=FjVr31ht0UPlAcmX-84NwfAGMQHTkrCe4o744jCAxiw,375
 fastled/cli_test.py,sha256=qJB9yLRFR3OwOwdIWSQ0fQsWLnA37v5pDccufiP_hTs,512
 fastled/cli_test_interactive.py,sha256=BjNhveZOk5aCffHbcrxPQQjWmAuj4ClVKKcKX5eY6yM,542
-fastled/client_server.py,sha256=_M3EsHOLlQI610qxcmBCLa2K5ERmNHpF1cI2C_xzkmk,14549
-fastled/compile_server.py,sha256=rkXvrvdav5vDG8lv_OlBX3YSCHtnHMt25nXbfeg_r78,2960
-fastled/compile_server_impl.py,sha256=_DRdt-eWTdOr2mXvO7h6dKqDSonsm523bIqCZr4wf2k,12615
+fastled/client_server.py,sha256=zQF4ioOkQzHkKAP0A-8mqjVt8aGD9Sj9ijmknsdLW0U,14859
+fastled/compile_server.py,sha256=sRiXYzw7lv9vcWJWGPUkzOGZPmvZGV_TGwbHYoRc15s,3155
+fastled/compile_server_impl.py,sha256=0xWJg5b6n_Y-BKPI2ToG4bT7bB_ZuGNQy45JjyJDg6o,13659
 fastled/docker_manager.py,sha256=SC_qV6grNTGh0QD1ubKrULQblrN-2PORocISlaZg9NQ,35156
 fastled/filewatcher.py,sha256=3qS3L7zMQhFuVrkeGn1djsB_cB6x_E2YGJmmQWVAU_w,10033
 fastled/keyboard.py,sha256=UTAsqCn1UMYnB8YDzENiLTj4GeL45tYfEcO7_5fLFEg,3556
 fastled/keyz.py,sha256=LO-8m_7CpNDiZLM-FXhQ30f9gN1bUYz5lOsUPTIbI-c,4020
 fastled/live_client.py,sha256=MDauol0mxtXggV1Pv9ahC0Jjg_4wnnV6FjGEtdd9cxU,2763
-fastled/open_browser.py,sha256=Fv1w645rrVROaW4jjyU70Cfz6QPbyIqjK5yu16lhBlo,3836
+fastled/open_browser.py,sha256=6Iu1hVve0g1Hy4L0DcInmZJfeMM5-Dqcwlv9UqfCtCg,3983
 fastled/parse_args.py,sha256=waNeATOEz8D50Py5-9p6HcVSa21piTOAWOXS3ag8PYo,9428
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
 fastled/print_filter.py,sha256=ZpebuqfWEraSBD3Dm0PVZhQVBnU_NSILniwBHwjC1qM,2342
@@ -19,13 +19,13 @@ fastled/project_init.py,sha256=bBt4DwmW5hZkm9ICt9Qk-0Nr_0JQM7icCgH5Iv-bCQs,3984
 fastled/select_sketch_directory.py,sha256=-eudwCns3AKj4HuHtSkZAFwbnf005SNL07pOzs9VxnE,1383
 fastled/server_fastapi.py,sha256=ytsL4poO-yugDIhvYJq6nCNdLZ4fQJ1AFqXkF-uEkqo,1488
 fastled/server_fastapi_cli.py,sha256=fJGLvbJx5ertsZER_lgg0GfkYTX-V2rxzbNO1lEapU0,1392
-fastled/server_flask.py,sha256=i0OtDdrjiF9hjKNnI2ebf6Ag-mxMmtUCxnuHMBOzx7I,4665
-fastled/server_start.py,sha256=NfAV5pWdXn2HDvqiMrpHxuNqh2vnB4xVFltV5Pn16GM,3509
+fastled/server_flask.py,sha256=Temr1H-JXMOo0KGOs21BYRz0F7shH6Dsh_7T_bVRpsM,5851
+fastled/server_start.py,sha256=muMreRRYvjme-gETWDWzmT4mRGAXpDJkFy_oJ0lJZFY,3895
 fastled/settings.py,sha256=oezRvRUJWwauO-kpC4LDbKg6Q-ij4d09UtR2vkjSAPU,575
 fastled/sketch.py,sha256=tHckjDj8P6BI_LWzUFM071a9qcqPs-r-qFWIe50P5Xw,3391
 fastled/spinner.py,sha256=VHxmvB92P0Z_zYxRajb5HiNmkHHvZ5dG7hKtZltzpcs,867
 fastled/string_diff.py,sha256=NbtYxvBFxTUdmTpMLizlgZj2ULJ-7etj72GBdWDTGws,2496
-fastled/types.py,sha256=mNchhIW5m6hBBv63OYE0V_u5yGnS505eWjw7HCazb_s,4694
+fastled/types.py,sha256=k1j1y5h1zpRonp1mqRXy797mSbLqzf5K1QEgl8f27jQ,4822
 fastled/util.py,sha256=17f2A52TfBErJOEGC_Vs72t1mTDocLVTfnR9hWbXW8A,501
 fastled/web_compile.py,sha256=QTYHtcm55zsFxPhdA-qSPfL5Q4lhL3h3oNmir3m-Y3s,11345
 fastled/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
@@ -35,9 +35,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.79.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.2.79.dist-info/METADATA,sha256=Xtk4zA6J9YhYTUwjX6pxp6vxhzH4LJhFRBQVuhExk_A,22065
-fastled-1.2.79.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-fastled-1.2.79.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.2.79.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
-fastled-1.2.79.dist-info/RECORD,,
+fastled-1.2.81.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.2.81.dist-info/METADATA,sha256=dJ5jrJBU_ZPYVPE9HHC6S_61BN3-PxC297TXvEpYorc,22065
+fastled-1.2.81.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+fastled-1.2.81.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.2.81.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
+fastled-1.2.81.dist-info/RECORD,,