fastled 1.1.26__py2.py3-none-any.whl → 1.1.28__py2.py3-none-any.whl

fastled/__init__.py

@@ -1,3 +1,3 @@
-"""FastLED Wasm Compiler package."""
-
-__version__ = "1.1.26"
+"""FastLED Wasm Compiler package."""
+
+__version__ = "1.1.28"

fastled/app.py

@@ -154,7 +154,10 @@ def parse_args() -> argparse.Namespace:
 def run_server(args: argparse.Namespace) -> int:
     interactive = args.interactive
     auto_update = args.auto_update
-    compile_server = CompileServer(interactive=interactive, auto_updates=auto_update)
+    mapped_dir = Path(args.directory).absolute() if args.directory else None
+    compile_server = CompileServer(
+        interactive=interactive, auto_updates=auto_update, mapped_dir=mapped_dir
+    )
     if not interactive:
         print(f"Server started at {compile_server.url()}")
         compile_server.wait_for_startup()

fastled/client_server.py

@@ -1,8 +1,8 @@
 import argparse
 import shutil
-import subprocess
 import tempfile
 import time
+from multiprocessing import Process
 from pathlib import Path
 
 from fastled.build_mode import BuildMode, get_build_mode
@@ -11,7 +11,7 @@ from fastled.docker_manager import DockerManager
 from fastled.env import DEFAULT_URL
 from fastled.filewatcher import FileWatcherProcess
 from fastled.keyboard import SpaceBarWatcher
-from fastled.open_browser import open_browser_thread
+from fastled.open_browser import open_browser_process
 from fastled.sketch import looks_like_sketch_directory
 
 # CompiledResult
@@ -181,9 +181,9 @@ def run_client_server(args: argparse.Namespace) -> int:
         if not result.success:
             print("\nCompilation failed.")
 
-        browser_proc: subprocess.Popen | None = None
+        browser_proc: Process | None = None
         if open_web_browser:
-            browser_proc = open_browser_thread(Path(args.directory) / "fastled_js")
+            browser_proc = open_browser_process(Path(args.directory) / "fastled_js")
         else:
             print("\nCompilation successful.")
             if compile_server:

fastled/compile_server.py

@@ -27,8 +27,14 @@ class CompileServer:
         container_name=_DEFAULT_CONTAINER_NAME,
         interactive: bool = False,
         auto_updates: bool | None = None,
+        mapped_dir: Path | None = None,
     ) -> None:
-
+        if interactive and not mapped_dir:
+            raise ValueError(
+                "Interactive mode requires a mapped directory point to a sketch"
+            )
+        if not interactive and mapped_dir:
+            raise ValueError("Mapped directory is only used in interactive mode")
         cwd = Path(".").resolve()
         fastled_src_dir: Path | None = None
         if looks_like_fastled_repo(cwd):
@@ -38,6 +44,7 @@ class CompileServer:
             fastled_src_dir = cwd / "src"
 
         self.container_name = container_name
+        self.mapped_dir = mapped_dir
         self.docker = DockerManager()
         self.fastled_src_dir: Path | None = fastled_src_dir
         self.interactive = interactive
@@ -133,6 +140,19 @@ class CompileServer:
             volumes = {
                 str(self.fastled_src_dir): {"bind": "/host/fastled/src", "mode": "ro"}
             }
+        if self.interactive:
+            # add the mapped directory to the container
+            print(f"Mounting {self.mapped_dir} into container /mapped")
+            # volumes = {str(self.mapped_dir): {"bind": "/mapped", "mode": "rw"}}
+            # add it
+            assert self.mapped_dir is not None
+            dir_name = self.mapped_dir.name
+            if not volumes:
+                volumes = {}
+            volumes[str(self.mapped_dir)] = {
+                "bind": f"/mapped/{dir_name}",
+                "mode": "rw",
+            }
 
         cmd_str = subprocess.list2cmdline(server_command)
         if not self.interactive:

fastled/open_browser.py

@@ -1,35 +1,23 @@
+import os
 import socket
-import subprocess
+import sys
+from multiprocessing import Process
 from pathlib import Path
 
+from livereload import Server
+
 DEFAULT_PORT = 8081
 
 
-def _open_browser_python(fastled_js: Path, port: int) -> subprocess.Popen:
-    """Start livereload server in the fastled_js directory using CLI"""
+def _open_browser_python(fastled_js: Path, port: int) -> Server:
+    """Start livereload server in the fastled_js directory using API"""
     print(f"\nStarting livereload server in {fastled_js} on port {port}")
 
-    # Construct command for livereload CLI
-    cmd = [
-        "livereload",
-        str(fastled_js),  # directory to serve
-        "--port",
-        str(port),
-        "-t",
-        str(fastled_js / "index.html"),  # file to watch
-        "-w",
-        "0.1",  # delay
-        "-o",
-        "0.5",  # open browser delay
-    ]
-
-    # Start the process
-    process = subprocess.Popen(
-        cmd,
-        # stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL,
-    )
-    return process
+    server = Server()
+    server.watch(str(fastled_js / "index.html"), delay=0.1)
+    server.setHeader("Cache-Control", "no-cache")
+    server.serve(root=str(fastled_js), port=port, open_url_delay=0.5)
+    return server
 
 
 def _find_open_port(start_port: int) -> int:
@@ -42,11 +30,29 @@ def _find_open_port(start_port: int) -> int:
             port += 1
 
 
-def open_browser_thread(fastled_js: Path, port: int | None = None) -> subprocess.Popen:
-    """Start livereload server in the fastled_js directory and return the started thread"""
+def _run_server(fastled_js: Path, port: int) -> None:
+    """Function to run in separate process that starts the livereload server"""
+    sys.stderr = open(os.devnull, "w")  # Suppress stderr output
+    _open_browser_python(fastled_js, port)
+    try:
+        # Keep the process running
+        while True:
+            pass
+    except KeyboardInterrupt:
+        print("\nShutting down livereload server...")
+
+
+def open_browser_process(fastled_js: Path, port: int | None = None) -> Process:
+    """Start livereload server in the fastled_js directory and return the process"""
     if port is None:
         port = DEFAULT_PORT
 
     port = _find_open_port(port)
 
-    return _open_browser_python(fastled_js, port)
+    process = Process(
+        target=_run_server,
+        args=(fastled_js, port),
+        daemon=True,
+    )
+    process.start()
+    return process

{fastled-1.1.26.dist-info → fastled-1.1.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.26
+Version: 1.1.28
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -165,7 +165,8 @@ A: A big chunk of space is being used by unnecessary javascript `emscripten` is
 
 # Revisions
   
-  * 1.1.26 - Fixed `--interactive` so that it now works correctly.
+  * 1.1.28 - Adds cache control headers to the live server to disable all caching in the live browser.
+  * 1.1.27 - Fixed `--interactive` so that it now works correctly.
   * 1.1.25 - Improved detecting which sketch directory the user means by fuzzy matching.
   * 1.1.24 - Adds progress spinning bar for pulling images, which take a long time.
   * 1.1.23 - Various fixes for MacOS

{fastled-1.1.26.dist-info → fastled-1.1.28.dist-info}/RECORD

@@ -1,14 +1,14 @@
-fastled/__init__.py,sha256=5-jQK-HR_0kUeBf2hyQ72AApd6GSPIjapr6fk2DY-Dg,64
-fastled/app.py,sha256=U8JN0VGC2adw6BKC7INco4iDG5zLj4L2Etzr9smWyeQ,6861
+fastled/__init__.py,sha256=HMXRAUlJ0qqTwg5n-j-Bgndq0EzWjp-bqu6VcSiNeq4,61
+fastled/app.py,sha256=oL_IXsYxDRaw9eU2aSkCZ57xAUedbNWT4-WwCsJT2Sc,6978
 fastled/build_mode.py,sha256=joMwsV4K1y_LijT4gEAcjx69RZBoe_KmFmHZdPYbL_4,631
 fastled/cli.py,sha256=CNR_pQR0sNVPNuv8e_nmm-0PI8sU-eUBUgnWgWkzW9c,237
-fastled/client_server.py,sha256=KdjgAiYJ2mKXIfYVFcVZtVDtbZhzkjqrzatAwNa_QWw,11437
-fastled/compile_server.py,sha256=rtAW9zllb8WOSzhoRUMtdMGDzYFL4CtyoWVa7Y-jK24,5810
+fastled/client_server.py,sha256=IK_u71XbmOAKBX1ovHATsCmfUON8VVJJu-XtObTuYJI,11448
+fastled/compile_server.py,sha256=Adb2lvJ_p6Ui7UMxijRtYJhbO4YPTERKVQeuoQgibSE,6724
 fastled/docker_manager.py,sha256=Ok8TC1JXMoNMWt4P9clFFEVE29Xd-4C_MvIMIfvNo78,22134
 fastled/env.py,sha256=8wctQwl5qE4CI8NBugHtgMmUfEfHZ869JX5lGdSOJxc,304
 fastled/filewatcher.py,sha256=5dVmjEG23kMeJa29tRVm5XKSr9sTD4ME2boo-CFDuUM,6910
 fastled/keyboard.py,sha256=Zz_ggxOUTX2XQEy6K6kAoorVlUev4wEk9Awpvv9aStA,3241
-fastled/open_browser.py,sha256=RRHcsZ5Vzsw1AuZUEYuSfjKmf_9j3NGMDUR-FndHmqs,1483
+fastled/open_browser.py,sha256=-2_vyf6dbi2xGex-CMZHVVcXvwXGJkLOwFcjHGxknUQ,1769
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
 fastled/select_sketch_directory.py,sha256=TZdCjl1D7YMKjodMTvDRurPcpAmN3x0TcJxffER2NfM,1314
 fastled/sketch.py,sha256=5nRjg281lMH8Bo9wKjbcpTQCfEP574ZCG-lukvFmyQ8,2656
@@ -18,9 +18,9 @@ fastled/types.py,sha256=dDIsGHJkHNJ7B61wNp6X0JSLs_nrHiq7RlNqNWbwFec,194
 fastled/util.py,sha256=t4M3NFMhnCzfYbLvIyJi0RdFssZqbTN_vVIaej1WV-U,265
 fastled/web_compile.py,sha256=KuvKGdX6SSUUqC7YgX4T9SMSP5wdcPUhpg9-K9zPoTI,10378
 fastled/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
-fastled-1.1.26.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.1.26.dist-info/METADATA,sha256=Sp3HqgomtVTcvohI_6j5V1z6xt7GpKWZjgmhRSPOjLs,14324
-fastled-1.1.26.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
-fastled-1.1.26.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.1.26.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
-fastled-1.1.26.dist-info/RECORD,,
+fastled-1.1.28.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.1.28.dist-info/METADATA,sha256=j1WPsQq5G-YdMkuogYjcJKvO-X75I3Fo5oarOa-hTXA,14428
+fastled-1.1.28.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+fastled-1.1.28.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.1.28.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
+fastled-1.1.28.dist-info/RECORD,,