fastled 1.2.19__tar.gz → 1.2.21__tar.gz

{fastled-1.2.19 → fastled-1.2.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.2.19
+Version: 1.2.21
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -20,6 +20,7 @@ Requires-Dist: appdirs>=1.4.4
 Requires-Dist: rapidfuzz>=3.10.1
 Requires-Dist: progress>=1.6
 Requires-Dist: Flask>=3.0.0
+Requires-Dist: livereload
 
 # FastLED Wasm compiler
 
@@ -285,6 +286,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` bun
 
 # Revisions
 
+  * 1.2.20 - Fixed up path issue for web browser launch for hot reload.
   * 1.2.19 - Compilation failure now overwrites the index.html file with error message.
   * 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.

{fastled-1.2.19 → fastled-1.2.21}/README.md

@@ -262,6 +262,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` bun
 
 # Revisions
 
+  * 1.2.20 - Fixed up path issue for web browser launch for hot reload.
   * 1.2.19 - Compilation failure now overwrites the index.html file with error message.
   * 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.

{fastled-1.2.19 → fastled-1.2.21}/pyproject.toml

@@ -21,6 +21,7 @@ dependencies = [
     "rapidfuzz>=3.10.1",
     "progress>=1.6",
     "Flask>=3.0.0",
+    "livereload",
 ]
 
 dynamic = ["version"]

{fastled-1.2.19 → fastled-1.2.21}/src/fastled/__init__.py

@@ -15,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.19"
+__version__ = "1.2.21"
 
 
 class Api:
@@ -184,7 +184,9 @@ class Docker:
             )
         else:
             print(f"Cloning {url} into {output_dir}")
-            subprocess.run(["git", "clone", url, str(output_dir)], check=True)
+            subprocess.run(
+                ["git", "clone", "--depth", "1", url, str(output_dir)], check=True
+            )
 
         dockerfile_path = (
             output_dir / "src" / "platforms" / "wasm" / "compiler" / "Dockerfile"
@@ -317,7 +319,7 @@ class Test:
     @staticmethod
     def spawn_http_server(
         directory: Path | str = Path("."),
-        port: int = 8000,
+        port: int | None = None,
         open_browser: bool = True,
     ) -> Process:
         from fastled.open_browser import open_browser_process

{fastled-1.2.19 → fastled-1.2.21}/src/fastled/compile_server.py

@@ -81,7 +81,12 @@ class CompileServer:
         return self.impl._start()
 
     def stop(self) -> None:
-        return self.impl.stop()
+        try:
+            return self.impl.stop()
+        except KeyboardInterrupt:
+            import _thread
+
+            _thread.interrupt_main()
 
     def process_running(self) -> bool:
         return self.impl.process_running()

{fastled-1.2.19 → fastled-1.2.21}/src/fastled/open_browser.py

@@ -1,5 +1,8 @@
+import socket
 import subprocess
 import sys
+import time
+import webbrowser
 from multiprocessing import Process
 from pathlib import Path
 
@@ -21,8 +24,6 @@ def open_http_server_subprocess(
             "--port",
             str(port),
         ]
-        if not open_browser:
-            cmd.append("--no-browser")
         # return subprocess.Popen(cmd)  # type ignore
         # pipe stderr and stdout to null
         subprocess.run(
@@ -36,16 +37,54 @@ def open_http_server_subprocess(
         _thread.interrupt_main()
 
 
+def is_port_free(port: int) -> bool:
+    """Check if a port is free"""
+    import socket
+
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        return s.connect_ex(("localhost", port)) != 0
+
+
+def find_free_port(start_port: int) -> int:
+    """Find a free port starting at start_port"""
+    for port in range(start_port, start_port + 100):
+        if is_port_free(port):
+            print(f"Found free port: {port}")
+            return port
+        else:
+            print(f"Port {port} is in use, finding next")
+    raise ValueError("Could not find a free port")
+
+
+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 open_browser_process(
-    fastled_js: Path, port: int = DEFAULT_PORT, open_browser: bool = True
+    fastled_js: Path, port: int | None = None, open_browser: bool = True
 ) -> Process:
     """Start livereload server in the fastled_js directory and return the process"""
+    if port is not None:
+        if not is_port_free(port):
+            raise ValueError(f"Port {port} was specified but in use in use")
+    else:
+        port = find_free_port(DEFAULT_PORT)
     out: Process = Process(
         target=open_http_server_subprocess,
         args=(fastled_js, port, open_browser),
         daemon=True,
     )
     out.start()
+    wait_for_server(port)
+    if open_browser:
+        print(f"Opening browser to http://localhost:{port}")
+        webbrowser.open(url=f"http://localhost:{port}", new=1, autoraise=True)
     return out
 
 

{fastled-1.2.19 → fastled-1.2.21}/src/fastled/open_browser2.py

@@ -1,8 +1,7 @@
 import argparse
-import socket
-import time
 from pathlib import Path
-from threading import Thread
+
+from livereload import Server
 
 
 def _run_flask_server(fastled_js: Path, port: int) -> None:
@@ -12,6 +11,9 @@ def _run_flask_server(fastled_js: Path, port: int) -> None:
 
         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")
@@ -49,7 +51,13 @@ def _run_flask_server(fastled_js: Path, port: int) -> None:
             response.headers["Expires"] = "0"
             return response
 
-        app.run(port=port, debug=True)
+        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
 
@@ -61,33 +69,13 @@ def _run_flask_server(fastled_js: Path, port: int) -> None:
         _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:
+def run(path: Path, port: int) -> None:
     """Run the Flask server."""
     try:
-        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)
+        import warnings
+
+        warnings.warn("Flask server has stopped")
     except KeyboardInterrupt:
         import _thread
 
@@ -110,19 +98,13 @@ def parse_args() -> argparse.Namespace:
         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)
+    run(args.fastled_js, args.port)
 
 
 if __name__ == "__main__":

{fastled-1.2.19 → fastled-1.2.21}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.2.19
+Version: 1.2.21
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -20,6 +20,7 @@ Requires-Dist: appdirs>=1.4.4
 Requires-Dist: rapidfuzz>=3.10.1
 Requires-Dist: progress>=1.6
 Requires-Dist: Flask>=3.0.0
+Requires-Dist: livereload
 
 # FastLED Wasm compiler
 
@@ -285,6 +286,7 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` bun
 
 # Revisions
 
+  * 1.2.20 - Fixed up path issue for web browser launch for hot reload.
   * 1.2.19 - Compilation failure now overwrites the index.html file with error message.
   * 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.

{fastled-1.2.19 → fastled-1.2.21}/src/fastled.egg-info/requires.txt

@@ -8,3 +8,4 @@ appdirs>=1.4.4
 rapidfuzz>=3.10.1
 progress>=1.6
 Flask>=3.0.0
+livereload