fastled 1.2.14__tar.gz → 1.2.16__tar.gz

{fastled-1.2.14 → fastled-1.2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.2.14
+Version: 1.2.16
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -19,7 +19,7 @@ Requires-Dist: disklru>=2.0.1
 Requires-Dist: appdirs>=1.4.4
 Requires-Dist: rapidfuzz>=3.10.1
 Requires-Dist: progress>=1.6
-Requires-Dist: static-npm>=1.0.6
+Requires-Dist: Flask>=3.0.0
 
 # FastLED Wasm compiler
 
@@ -282,8 +282,11 @@ A: `delay()` will block `loop()` which blocks the main thread of the browser. Th
 Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` bundling. The wasm_compiler_settings.py file in the FastLED repo can tweak this.
 
+
 # Revisions
 
+  * 1.2.16 - Force mime types in web browser as some users may not have it correct in their registry.
+  * 1.2.15 - Rewrote http server using flask. Reduced install size significantly.
   * 1.2.13 - More fixes for npm live-server, now uses `static-npm` to launch it.
   * 1.2.12 - Fixes for python npm for launching live-server
   * 1.2.10 - `fastled.Test` now allows you to spawn the http webserver on a folder with an index.html in it.

{fastled-1.2.14 → fastled-1.2.16}/README.md

@@ -259,8 +259,11 @@ A: `delay()` will block `loop()` which blocks the main thread of the browser. Th
 Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` bundling. The wasm_compiler_settings.py file in the FastLED repo can tweak this.
 
+
 # Revisions
 
+  * 1.2.16 - Force mime types in web browser as some users may not have it correct in their registry.
+  * 1.2.15 - Rewrote http server using flask. Reduced install size significantly.
   * 1.2.13 - More fixes for npm live-server, now uses `static-npm` to launch it.
   * 1.2.12 - Fixes for python npm for launching live-server
   * 1.2.10 - `fastled.Test` now allows you to spawn the http webserver on a folder with an index.html in it.

{fastled-1.2.14 → fastled-1.2.16}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
     "appdirs>=1.4.4",
     "rapidfuzz>=3.10.1",
     "progress>=1.6",
-    "static-npm>=1.0.6",
+    "Flask>=3.0.0",
 ]
 
 dynamic = ["version"]

{fastled-1.2.14 → fastled-1.2.16}/src/fastled/__init__.py

@@ -3,6 +3,7 @@
 # context
 import subprocess
 from contextlib import contextmanager
+from multiprocessing import Process
 from pathlib import Path
 from typing import Generator
 
@@ -14,7 +15,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.14"
+__version__ = "1.2.16"
 
 
 class Api:
@@ -318,12 +319,12 @@ class Test:
         directory: Path | str = Path("."),
         port: int = 8000,
         open_browser: bool = True,
-    ) -> subprocess.Popen:
-        from fastled.open_browser import open_http_server
+    ) -> Process:
+        from fastled.open_browser import open_browser_process
 
         if isinstance(directory, str):
             directory = Path(directory)
-        proc: subprocess.Popen = open_http_server(
+        proc: Process = open_browser_process(
             directory, port=port, open_browser=open_browser
         )
         return proc

fastled-1.2.16/src/fastled/open_browser.py

@@ -0,0 +1,63 @@
+import subprocess
+import sys
+from multiprocessing import Process
+from pathlib import Path
+
+DEFAULT_PORT = 8081
+
+PYTHON_EXE = sys.executable
+
+
+def open_http_server_subprocess(
+    fastled_js: Path, port: int, open_browser: bool
+) -> None:
+    """Start livereload server in the fastled_js directory and return the process"""
+
+    cmd = [
+        PYTHON_EXE,
+        "-m",
+        "fastled.open_browser2",
+        str(fastled_js),
+        "--port",
+        str(port),
+    ]
+    if not open_browser:
+        cmd.append("--no-browser")
+    # return subprocess.Popen(cmd)  # type ignore
+    subprocess.run(cmd)  # type ignore
+
+
+def open_browser_process(
+    fastled_js: Path, port: int = DEFAULT_PORT, open_browser: bool = True
+) -> Process:
+    """Start livereload server in the fastled_js directory and return the process"""
+    out: Process = Process(
+        target=open_http_server_subprocess,
+        args=(fastled_js, port, open_browser),
+        daemon=True,
+    )
+    out.start()
+    return out
+
+
+if __name__ == "__main__":
+    import argparse
+
+    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",
+        type=int,
+        default=DEFAULT_PORT,
+        help=f"Port to run the server on (default: {DEFAULT_PORT})",
+    )
+    args = parser.parse_args()
+
+    proc = open_browser_process(args.fastled_js, args.port, open_browser=True)
+    proc.join()

fastled-1.2.16/src/fastled/open_browser2.py

@@ -0,0 +1,114 @@
+import argparse
+import socket
+import time
+from pathlib import Path
+from threading import Thread
+
+
+def _run_flask_server(fastled_js: Path, port: int) -> None:
+    """Run Flask server with live reload in a subprocess"""
+    try:
+        from flask import Flask, send_from_directory
+
+        app = Flask(__name__)
+
+        @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"
+            return response
+
+        app.run(port=port, debug=True)
+    except Exception as e:
+        print(f"Failed to run Flask server: {e}")
+        import _thread
+
+        _thread.interrupt_main()
+
+
+def wait_for_server(port: int, timeout: int = 10) -> None:
+    """Wait for the server to start."""
+    future_time = time.time() + timeout
+    while future_time > time.time():
+        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+            if sock.connect_ex(("localhost", port)) == 0:
+                return
+    raise TimeoutError("Could not connect to server")
+
+
+def wait_for_server_then_launch_browser(port: int) -> None:
+    """Wait for the server to start, then launch the browser."""
+    wait_for_server(port)
+    import webbrowser
+
+    webbrowser.open(f"http://localhost:{port}")
+
+
+def run(path: Path, port: int, open_browser: bool) -> None:
+    """Run the Flask server."""
+    if open_browser:
+        browser_thread = Thread(
+            target=wait_for_server_then_launch_browser, args=(port,), daemon=True
+        )
+        browser_thread.start()
+    _run_flask_server(path, port)
+
+
+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(
+        "--no-browser",
+        action="store_true",
+        help="Do not open the browser",
+    )
+    return parser.parse_args()
+
+
+def main() -> None:
+    """Main function."""
+    args = parse_args()
+    open_browser = not args.no_browser
+    run(args.fastled_js, args.port, open_browser)
+
+
+if __name__ == "__main__":
+    main()

{fastled-1.2.14 → fastled-1.2.16}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.2.14
+Version: 1.2.16
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -19,7 +19,7 @@ Requires-Dist: disklru>=2.0.1
 Requires-Dist: appdirs>=1.4.4
 Requires-Dist: rapidfuzz>=3.10.1
 Requires-Dist: progress>=1.6
-Requires-Dist: static-npm>=1.0.6
+Requires-Dist: Flask>=3.0.0
 
 # FastLED Wasm compiler
 
@@ -282,8 +282,11 @@ A: `delay()` will block `loop()` which blocks the main thread of the browser. Th
 Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` bundling. The wasm_compiler_settings.py file in the FastLED repo can tweak this.
 
+
 # Revisions
 
+  * 1.2.16 - Force mime types in web browser as some users may not have it correct in their registry.
+  * 1.2.15 - Rewrote http server using flask. Reduced install size significantly.
   * 1.2.13 - More fixes for npm live-server, now uses `static-npm` to launch it.
   * 1.2.12 - Fixes for python npm for launching live-server
   * 1.2.10 - `fastled.Test` now allows you to spawn the http webserver on a folder with an index.html in it.

{fastled-1.2.14 → fastled-1.2.16}/src/fastled.egg-info/SOURCES.txt

@@ -38,6 +38,7 @@ src/fastled/filewatcher.py
 src/fastled/keyboard.py
 src/fastled/live_client.py
 src/fastled/open_browser.py
+src/fastled/open_browser2.py
 src/fastled/parse_args.py
 src/fastled/paths.py
 src/fastled/project_init.py

{fastled-1.2.14 → fastled-1.2.16}/src/fastled.egg-info/requires.txt

@@ -7,4 +7,4 @@ disklru>=2.0.1
 appdirs>=1.4.4
 rapidfuzz>=3.10.1
 progress>=1.6
-static-npm>=1.0.6
+Flask>=3.0.0

{fastled-1.2.14 → fastled-1.2.16}/tests/test_http_server.py

@@ -16,12 +16,6 @@ TIMEOUT = 120
 
 assert INDEX_HTML.exists()
 
-# def override(url) -> None:
-#     """Override the server url."""
-#     assert isinstance(url, str) and "localhost" in url
-
-# client_server.TEST_BEFORE_COMPILE = override
-
 
 class HttpServerTester(unittest.TestCase):
     """Main tester class."""
@@ -42,7 +36,6 @@ class HttpServerTester(unittest.TestCase):
         response = httpx.get("http://localhost:8081", timeout=5)
         self.assertEqual(response.status_code, 200)
         proc.kill()
-        proc.wait()
 
 
 if __name__ == "__main__":

fastled-1.2.14/src/fastled/open_browser.py

@@ -1,93 +0,0 @@
-import shutil
-import socket
-import subprocess
-from multiprocessing import Process
-from pathlib import Path
-
-from static_npm import Npm, Npx
-from static_npm.paths import CACHE_DIR
-from static_npm.running_process import RunningProcess
-
-DEFAULT_PORT = 8081
-
-
-def open_http_server(
-    fastled_js: Path, port: int | None = None, open_browser=True
-) -> subprocess.Popen | RunningProcess:
-    """Start livereload server in the fastled_js directory using API"""
-    cmd_list: list[str]
-    print(f"\nStarting livereload server in {fastled_js}")
-
-    cmd_list = ["live-server"]
-    if port is not None:
-        cmd_list.extend([f"--port={port}"])
-    if not open_browser:
-        cmd_list.append("--no-browser")
-
-    live_server_where = shutil.which("live-server")
-    if live_server_where is None:
-        print("live-server not found. Installing it with the embedded npm...")
-        # cmd_list = [sys.executable, "-m", "nodejs.npm", "install", "-g", "live-server"]
-        # npm.call("install -g live-server --force --legacy-peer-deps")
-        tool_dir = CACHE_DIR / "live-server"
-        tool_dir.mkdir(parents=True, exist_ok=True)
-        npm = Npm()
-        npx = Npx()
-        npm.run(["install", "live-server", "--prefix", tool_dir])
-        # npm.run(["install", "live-server", "--prefix", str(tool_dir)])
-        cmd_str = subprocess.list2cmdline(
-            ["npx"] + ["--prefix", str(tool_dir)] + cmd_list
-        )
-        print(f"Running: {cmd_str}")
-        proc = npx.run(["--prefix", str(tool_dir)] + cmd_list, cwd=fastled_js)
-        return proc  # type ignore
-    else:
-        # npx.run("live-server", check=False)
-        # subprocess.run(cmd_list)
-        live_server_where = shutil.which("live-server")
-        print(f"Using live-server from {live_server_where}")
-        cmd_list = ["live-server"]
-        if port is not None:
-            cmd_list.extend([f"--port={port}"])
-        if not open_browser:
-            cmd_list.append("--no-browser")
-        # subprocess.run(["cd", str(fastled_js), "&&"] + cmd_list)
-        return subprocess.Popen(cmd_list, cwd=str(fastled_js), shell=True)
-
-
-def _open_browser_python(fastled_js: Path) -> None:
-    """Start livereload server in the fastled_js directory using API"""
-    proc = open_http_server(fastled_js)
-    proc.wait()
-
-
-def _find_open_port(start_port: int) -> int:
-    """Find an open port starting from start_port."""
-    port = start_port
-    while True:
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
-            if sock.connect_ex(("localhost", port)) != 0:
-                return port
-            port += 1
-
-
-def _run_server(fastled_js: Path) -> None:
-    """Function to run in separate process that starts the livereload server"""
-
-    try:
-        # Keep the process running
-        _open_browser_python(fastled_js)
-    except KeyboardInterrupt:
-        print("\nShutting down livereload server...")
-
-
-def open_browser_process(fastled_js: Path) -> Process:
-    """Start livereload server in the fastled_js directory and return the process"""
-
-    process = Process(
-        target=_run_server,
-        args=(fastled_js,),
-        daemon=True,
-    )
-    process.start()
-    return process