fastled 1.2.61__py3-none-any.whl → 1.2.63__py3-none-any.whl

fastled/__init__.py

@@ -13,7 +13,7 @@ from .types import BuildMode, CompileResult, CompileServerError
 # 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.61"
+__version__ = "1.2.63"
 
 DOCKER_FILE = (
     "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"

fastled/open_browser.py

@@ -26,7 +26,7 @@ def _open_http_server_subprocess(
         cmd = [
             PYTHON_EXE,
             "-m",
-            "fastled.open_browser2",
+            "fastled.server_start",
             str(fastled_js),
             "--port",
             str(port),

fastled/server_fastapi_cli.py

@@ -32,7 +32,7 @@ def _run_fastapi_server(
         "fastled.server_fastapi:app",
         host="127.0.0.1",
         port=port,
-        reload=True,
+        reload=False,
         # reload_includes=["index.html"],
         ssl_certfile=certfile,
         ssl_keyfile=keyfile,

fastled/server_flask.py

@@ -0,0 +1,152 @@
+import argparse
+from multiprocessing import Process
+from pathlib import Path
+
+from livereload import Server
+
+
+def _run_flask_server(
+    fastled_js: Path,
+    port: int,
+    certfile: Path | None = None,
+    keyfile: Path | None = None,
+) -> None:
+    """Run Flask server with live reload in a subprocess
+
+    Args:
+        fastled_js: Path to the fastled_js directory
+        port: Port to run the server on
+        certfile: Path to the SSL certificate file
+        keyfile: Path to the SSL key file
+    """
+    try:
+        from flask import Flask, send_from_directory
+
+        app = Flask(__name__)
+
+        # Must be a full path or flask will fail to find the file.
+        fastled_js = fastled_js.resolve()
+
+        @app.route("/")
+        def serve_index():
+            return send_from_directory(fastled_js, "index.html")
+
+        @app.route("/<path:path>")
+        def serve_files(path):
+            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"):
+                response.headers["Content-Type"] = "application/javascript"
+            if path.endswith(".css"):
+                response.headers["Content-Type"] = "text/css"
+            if path.endswith(".wasm"):
+                response.headers["Content-Type"] = "application/wasm"
+            if path.endswith(".json"):
+                response.headers["Content-Type"] = "application/json"
+            if path.endswith(".png"):
+                response.headers["Content-Type"] = "image/png"
+            if path.endswith(".jpg"):
+                response.headers["Content-Type"] = "image/jpeg"
+            if path.endswith(".jpeg"):
+                response.headers["Content-Type"] = "image/jpeg"
+            if path.endswith(".gif"):
+                response.headers["Content-Type"] = "image/gif"
+            if path.endswith(".svg"):
+                response.headers["Content-Type"] = "image/svg+xml"
+            if path.endswith(".ico"):
+                response.headers["Content-Type"] = "image/x-icon"
+            if path.endswith(".html"):
+                response.headers["Content-Type"] = "text/html"
+
+            # now also add headers to force no caching
+            response.headers["Cache-Control"] = "no-cache, no-store, must-revalidate"
+            response.headers["Pragma"] = "no-cache"
+            response.headers["Expires"] = "0"
+            return response
+
+        server = Server(app.wsgi_app)
+        # Watch index.html for changes
+        server.watch(str(fastled_js / "index.html"))
+        # server.watch(str(fastled_js / "index.js"))
+        # server.watch(str(fastled_js / "index.css"))
+        # Start the server
+        server.serve(port=port, debug=True)
+    except KeyboardInterrupt:
+        import _thread
+
+        _thread.interrupt_main()
+    except Exception as e:
+        print(f"Failed to run Flask server: {e}")
+        import _thread
+
+        _thread.interrupt_main()
+
+
+def run(
+    port: int, cwd: Path, certfile: Path | None = None, keyfile: Path | None = None
+) -> None:
+    """Run the Flask server."""
+    try:
+        _run_flask_server(cwd, port, certfile, keyfile)
+        import warnings
+
+        warnings.warn("Flask server has stopped")
+    except KeyboardInterrupt:
+        import _thread
+
+        _thread.interrupt_main()
+        pass
+
+
+def parse_args() -> argparse.Namespace:
+    """Parse the command line arguments."""
+    parser = argparse.ArgumentParser(
+        description="Open a browser to the fastled_js directory"
+    )
+    parser.add_argument(
+        "fastled_js", type=Path, help="Path to the fastled_js directory"
+    )
+    parser.add_argument(
+        "--port",
+        "-p",
+        type=int,
+        required=True,
+        help="Port to run the server on (default: %(default)s)",
+    )
+    parser.add_argument(
+        "--certfile",
+        type=Path,
+        help="Path to the SSL certificate file for HTTPS",
+    )
+    parser.add_argument(
+        "--keyfile",
+        type=Path,
+        help="Path to the SSL key file for HTTPS",
+    )
+    return parser.parse_args()
+
+
+def run_flask_server_process(
+    port: int,
+    cwd: Path | None = None,
+    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),
+    )
+    process.start()
+    return process
+
+
+def main() -> None:
+    """Main function."""
+    args = parse_args()
+    run(args.port, args.fastled_js, args.certfile, args.keyfile)
+
+
+if __name__ == "__main__":
+    main()

fastled/{open_browser2.py → server_start.py}

@@ -1,8 +1,34 @@
 import argparse
 import importlib.resources as pkg_resources
+from dataclasses import dataclass
+from multiprocessing import Process
 from pathlib import Path
 
 from fastled.server_fastapi_cli import run_fastapi_server_process
+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
+) -> Process:
+    """Run the server in a separate process."""
+    if True:
+        # Use Flask server
+        process = run_flask_server_process(
+            port=port,
+            cwd=cwd,
+            certfile=certfile,
+            keyfile=keyfile,
+        )
+    else:
+        # Use FastAPI server
+        process = run_fastapi_server_process(
+            port=port,
+            cwd=cwd,
+            certfile=certfile,
+            keyfile=keyfile,
+        )
+    return process
 
 
 def get_asset_path(filename: str) -> Path | None:
@@ -16,12 +42,12 @@ def get_asset_path(filename: str) -> Path | None:
         return None
 
 
-def run(
+def start_process(
     path: Path,
     port: int,
     certfile: Path | None = None,
     keyfile: Path | None = None,
-) -> None:
+) -> Process:
     """Run the server, using package assets if explicit paths are not provided"""
     # Use package resources if no explicit path
     if certfile is None:
@@ -31,16 +57,25 @@ def run(
 
     # _run_flask_server(path, port, certfile, keyfile)
     # run_fastapi_server_process(port=port, path=path, certfile=certfile, keyfile=keyfile)
-    proc = run_fastapi_server_process(port=port, cwd=path)
-    try:
-        proc.join()
-    except KeyboardInterrupt:
-        import _thread
+    proc = run_server_process(port=port, cwd=path)
+    # try:
+    #     proc.join()
+    # except KeyboardInterrupt:
+    #     import _thread
+
+    #     _thread.interrupt_main()
+    return proc
 
-        _thread.interrupt_main()
 
+@dataclass
+class Args:
+    fastled_js: Path
+    port: int
+    cert: Path | None
+    key: Path | None
 
-def parse_args() -> argparse.Namespace:
+
+def parse_args() -> Args:
     parser = argparse.ArgumentParser(
         description="Open a browser to the fastled_js directory"
     )
@@ -60,21 +95,37 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument(
         "--key", type=Path, help="(Optional) Path to SSL private key (PEM format)"
     )
-    return parser.parse_args()
+    args = parser.parse_args()
+    out: Args = Args(
+        fastled_js=args.fastled_js,
+        port=args.port,
+        cert=args.cert,
+        key=args.key,
+    )
+    if args.fastled_js is None:
+        raise ValueError("fastled_js directory is required")
+    return out
 
 
 def main() -> None:
-    args = parse_args()
+    args: Args = parse_args()
     fastled_js: Path = args.fastled_js
     port: int = args.port
     cert: Path | None = args.cert
     key: Path | None = args.key
-    run(
+    proc = start_process(
         path=fastled_js,
         port=port,
         certfile=cert,
         keyfile=key,
     )
+    try:
+        proc.join()
+    except KeyboardInterrupt:
+        import _thread
+
+        _thread.interrupt_main()
+        pass
 
 
 if __name__ == "__main__":

{fastled-1.2.61.dist-info → fastled-1.2.63.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastled
-Version: 1.2.61
+Version: 1.2.63
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -23,6 +23,8 @@ Requires-Dist: fastapi>=0.115.12
 Requires-Dist: uvicorn>=0.34.2
 Requires-Dist: pywebview>=5.4
 Requires-Dist: watchfiles>=1.0.5
+Requires-Dist: Flask>=3.0.0
+Requires-Dist: livereload
 Dynamic: home-page
 Dynamic: license-file
 Dynamic: maintainer

{fastled-1.2.61.dist-info → fastled-1.2.63.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fastled/__init__.py,sha256=w_GKHlTrhiwiz_aQU4IZ08bHxQvhoyhd1oXEsz3gzYQ,6734
+fastled/__init__.py,sha256=5aM7L5rPWOa6f56b-62Ta-VvK4OYGfZ0rAM9U06ffXY,6734
 fastled/app.py,sha256=Ozn7OJ0rz3CEHsJKMhFLxV7TisRKo4DuFpVhrf5FQNw,3944
 fastled/cli.py,sha256=FjVr31ht0UPlAcmX-84NwfAGMQHTkrCe4o744jCAxiw,375
 fastled/cli_test.py,sha256=qJB9yLRFR3OwOwdIWSQ0fQsWLnA37v5pDccufiP_hTs,512
@@ -11,14 +11,15 @@ fastled/interactive_srcs.py,sha256=F5nHdJc60xsnmOtnKhngE9JytqGn56PmYw_MVSIX1ac,1
 fastled/keyboard.py,sha256=UTAsqCn1UMYnB8YDzENiLTj4GeL45tYfEcO7_5fLFEg,3556
 fastled/keyz.py,sha256=WjfZHtZHEB8wNh1YYZGYwjx1jQV-6wwhCbYn4Zp7xs4,938
 fastled/live_client.py,sha256=MDauol0mxtXggV1Pv9ahC0Jjg_4wnnV6FjGEtdd9cxU,2763
-fastled/open_browser.py,sha256=YrjjCOALEStlrd-7gXGmzY0zSE5gJ6po__2u4M1orUk,4112
-fastled/open_browser2.py,sha256=xR8wLshpk3HPMtSzI48vUN9tvh0kMSR2eEs6LHpnpxM,2279
+fastled/open_browser.py,sha256=HKiSFGtp182JdZvletrGrG_sit5MSjIpl7z54ceYzXU,4111
 fastled/parse_args.py,sha256=xgjxirQVX3FQxHZNVJtQQxTOeSJRQdGUNQ7W33Y880Y,8051
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
 fastled/project_init.py,sha256=bBt4DwmW5hZkm9ICt9Qk-0Nr_0JQM7icCgH5Iv-bCQs,3984
 fastled/select_sketch_directory.py,sha256=TZdCjl1D7YMKjodMTvDRurPcpAmN3x0TcJxffER2NfM,1314
 fastled/server_fastapi.py,sha256=ytsL4poO-yugDIhvYJq6nCNdLZ4fQJ1AFqXkF-uEkqo,1488
-fastled/server_fastapi_cli.py,sha256=Qha2Wvv4V1dQ_xstmF4rEtv0dc6dO-AF-nUDH8FlgWw,1391
+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/settings.py,sha256=URgM6ZPlQYF-0ZTEhQCX8isLR6CbmYGwhDX4uXbh-ZI,468
 fastled/sketch.py,sha256=tHckjDj8P6BI_LWzUFM071a9qcqPs-r-qFWIe50P5Xw,3391
 fastled/spinner.py,sha256=VHxmvB92P0Z_zYxRajb5HiNmkHHvZ5dG7hKtZltzpcs,867
@@ -33,9 +34,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.61.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.2.61.dist-info/METADATA,sha256=-ZksctwA-RHaJmKW0QkXp1ltfcQEPuPkzlG0sxBDHE8,22010
-fastled-1.2.61.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-fastled-1.2.61.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.2.61.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
-fastled-1.2.61.dist-info/RECORD,,
+fastled-1.2.63.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.2.63.dist-info/METADATA,sha256=PlaQvKRqPQmKD0F2sDNNQBu2kGiGZCJwq_vYx-8YSOA,22064
+fastled-1.2.63.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+fastled-1.2.63.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.2.63.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
+fastled-1.2.63.dist-info/RECORD,,

{fastled-1.2.61.dist-info → fastled-1.2.63.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any