fastled 1.2.76__py3-none-any.whl → 1.2.78__py3-none-any.whl

fastled/__init__.py

@@ -7,17 +7,14 @@ from typing import Generator
 
 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
 
 # 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.76"
-
-DOCKER_FILE = (
-    "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"
-)
+__version__ = "1.2.78"
 
 
 class Api:
@@ -154,7 +151,6 @@ class Docker:
     @staticmethod
     def purge() -> None:
         from fastled.docker_manager import DockerManager
-        from fastled.settings import IMAGE_NAME
 
         docker_mgr = DockerManager()
         docker_mgr.purge(image_name=IMAGE_NAME)
@@ -217,4 +213,5 @@ __all__ = [
     "CompileResult",
     "CompileServerError",
     "BuildMode",
+    "DOCKER_FILE",
 ]

fastled/app.py

@@ -68,19 +68,37 @@ def main() -> int:
         print("Building is disabled")
         build = False
 
-    if build:
-        raise NotImplementedError("Building is not yet supported.")
+    if interactive:
+        # raise NotImplementedError("Building is not yet supported.")
         file_watcher_set(False)
-        project_root = Path(".").absolute()
-        print(f"Building Docker image at {project_root}")
-        from fastled import Api, Docker
-
-        server = Docker.spawn_server_from_fastled_repo(
-            project_root=project_root,
+        # project_root = Path(".").absolute()
+        # print(f"Building Docker image at {project_root}")
+        from fastled import Api
+
+        # server = Docker.spawn_server_from_fastled_repo(
+        #     project_root=project_root,
+        #     interactive=interactive,
+        #     sketch_folder=directory,
+        # )
+        # assert isinstance(server, CompileServer)
+        server: CompileServer = CompileServer(
             interactive=interactive,
-            sketch_folder=directory,
+            auto_updates=False,
+            mapped_dir=directory,
+            auto_start=False,
+            remove_previous=False,
         )
-        assert isinstance(server, CompileServer)
+
+        server.start(wait_for_startup=False)
+
+        try:
+            while server.process_running():
+                # wait for ctrl-c
+                time.sleep(0.1)
+        except KeyboardInterrupt:
+            print("\nExiting from server...")
+            server.stop()
+            return 0
 
         try:
             if interactive:

fastled/cli_test_interactive.py

@@ -0,0 +1,21 @@
+import sys
+
+from fastled.app import main as app_main
+
+if __name__ == "__main__":
+    # Note that the entry point for the exe is in cli.py
+    try:
+        import os
+
+        os.chdir("../fastled")
+        # sys.argv.append("--server")
+        # sys.argv.append("--local")
+        sys.argv.append("examples/FxWave2d")
+        sys.argv.append("-i")
+        sys.exit(app_main())
+    except KeyboardInterrupt:
+        print("\nExiting from main...")
+        sys.exit(1)
+    except Exception as e:
+        print(f"Error: {e}")
+        sys.exit(1)

fastled/client_server.py

@@ -381,12 +381,12 @@ def run_client_server(args: Args) -> int:
         url, compile_server = _try_start_server_or_get_url(auto_update, web, localhost)
     except KeyboardInterrupt:
         print("\nExiting from first try...")
-        if compile_server:
+        if compile_server is not None:
             compile_server.stop()
         return 1
     except Exception as e:
         print(f"Error: {e}")
-        if compile_server:
+        if compile_server is not None:
             compile_server.stop()
         return 1
 

fastled/compile_server_impl.py

@@ -15,7 +15,6 @@ from fastled.docker_manager import (
     RunningContainer,
     Volume,
 )
-from fastled.interactive_srcs import INTERACTIVE_SOURCES
 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
@@ -37,6 +36,32 @@ def _try_get_fastled_src(path: Path) -> Path | None:
     return None
 
 
+def _port_is_free(port: int) -> bool:
+    """Check if a port is free."""
+    import socket
+
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+        try:
+            _ = sock.bind(("localhost", port)) and sock.bind(("0.0.0.0", port))
+            return True
+        except OSError:
+            return False
+
+
+def _find_free_port() -> int:
+    """Find a free port on the system."""
+
+    start_port = 49152
+    tries = 10
+
+    for port in range(start_port, start_port + tries):
+        if _port_is_free(port):
+            return port
+    raise RuntimeError(
+        f"No free port found in the range {start_port}-{start_port + tries - 1}"
+    )
+
+
 class CompileServerImpl:
     def __init__(
         self,
@@ -202,6 +227,7 @@ class CompileServerImpl:
             image_name=IMAGE_NAME, tag="latest", upgrade=upgrade
         )
         DISK_CACHE.put("last-update", now_str)
+        CLIENT_PORT = 80  # TODO: Don't use port 80.
 
         print("Docker image now validated")
         port = SERVER_PORT
@@ -209,7 +235,11 @@ class CompileServerImpl:
             server_command = ["/bin/bash"]
         else:
             server_command = ["python", "/js/run.py", "server"] + SERVER_OPTIONS
-        ports = {80: port}
+        if self.interactive:
+            print("Disabling port forwarding in interactive mode")
+            ports = {}
+        else:
+            ports = {CLIENT_PORT: port}
         volumes = []
         if self.fastled_src_dir:
             print(
@@ -238,20 +268,39 @@ class CompileServerImpl:
             )
             if self.fastled_src_dir is not None:
                 # to allow for interactive compilation
-                interactive_sources = list(INTERACTIVE_SOURCES)
-                for src in interactive_sources:
-                    src_path = Path(src).absolute()
+                # interactive_sources = list(INTERACTIVE_SOURCES)
+                interactive_sources: list[tuple[Path, str]] = []
+                init_runtime_py = (
+                    Path(self.fastled_src_dir)
+                    / ".."
+                    / ".."
+                    / "fastled-wasm"
+                    / "compiler"
+                    / "init_runtime.py"
+                )
+                if init_runtime_py.exists():
+                    # fastled-wasm is in a sister directory, mapping this in to the container.
+                    mapping = (
+                        init_runtime_py,
+                        "/js/init_runtime.py",
+                    )
+                    interactive_sources.append(mapping)
+
+                src_host: Path
+                dst_container: str
+                for src_host, dst_container in interactive_sources:
+                    src_path = Path(src_host).absolute()
                     if src_path.exists():
-                        print(f"Mounting {src} into container")
+                        print(f"Mounting {src_host} into container")
                         volumes.append(
                             Volume(
                                 host_path=str(src_path),
-                                container_path=f"/js/fastled/{src}",
+                                container_path=dst_container,
                                 mode="rw",
                             )
                         )
                     else:
-                        print(f"Could not find {src}")
+                        print(f"Could not find {src_path}")
 
         cmd_str = subprocess.list2cmdline(server_command)
         if not self.interactive:
@@ -269,6 +318,13 @@ class CompileServerImpl:
             print("Compile server starting")
             return port
         else:
+            client_port_mapped = CLIENT_PORT in ports
+            port_is_free = _port_is_free(CLIENT_PORT)
+            if client_port_mapped and port_is_free:
+                warnings.warn(
+                    f"Can't expose port {CLIENT_PORT}, disabling port forwarding in interactive mode"
+                )
+                ports = {}
             self.docker.run_container_interactive(
                 image_name=IMAGE_NAME,
                 tag="latest",

fastled/print_filter.py

@@ -39,6 +39,10 @@ def _handle_ino_cpp(line: str) -> str:
     return line
 
 
+def _handle_fastled_src(line: str) -> str:
+    return line.replace("fastled/src", "src")
+
+
 class PrintFilterDefault(PrintFilter):
     """Provides default filtering for FastLED output."""
 
@@ -61,6 +65,9 @@ class PrintFilterFastled(PrintFilter):
             # print(line)
             if "# WASM is building" in line:
                 self.build_started = True
+            line = _handle_fastled_src(
+                line
+            )  # Always convert fastled/src to src for file matchups.
             if self.build_started or " error: " in line:
                 line = _handle_ino_cpp(line)
             out.append(line)

fastled/settings.py

@@ -12,3 +12,7 @@ SERVER_PORT = 9021
 IMAGE_NAME = "niteris/fastled-wasm"
 DEFAULT_CONTAINER_NAME = "fastled-wasm-compiler"
 # IMAGE_TAG = "latest"
+
+DOCKER_FILE = (
+    "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"
+)

{fastled-1.2.76.dist-info → fastled-1.2.78.dist-info}/METADATA

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

{fastled-1.2.76.dist-info → fastled-1.2.78.dist-info}/RECORD

@@ -1,27 +1,27 @@
-fastled/__init__.py,sha256=qOnSt1eqFW7UnWuHYVomp-m5U5G7PE5bcC0NTFZ4Mr4,6770
-fastled/app.py,sha256=vteMH0WvWGkQq-FR6SdAzqJcHqx0Gcj-aclXYZL7n5Q,4073
+fastled/__init__.py,sha256=OO3Y9-Fio1wpJ92Fg2E6kWYfjOkaq6N_LwI0wWwGRu0,6680
+fastled/app.py,sha256=0W8Mbplo5UCRzj7nMVgkmCBddQGufsUQjkUUT4pMp74,4611
 fastled/cli.py,sha256=FjVr31ht0UPlAcmX-84NwfAGMQHTkrCe4o744jCAxiw,375
 fastled/cli_test.py,sha256=qJB9yLRFR3OwOwdIWSQ0fQsWLnA37v5pDccufiP_hTs,512
-fastled/client_server.py,sha256=eG82h-27Y40szCew976lv9I6bP-YxtRV6sFNDVNTapo,14525
+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=LnvxeSgBQ3lvey3_dz71UnJjCb5WTUQaPYtuSc1BMvo,10706
+fastled/compile_server_impl.py,sha256=_DRdt-eWTdOr2mXvO7h6dKqDSonsm523bIqCZr4wf2k,12615
 fastled/docker_manager.py,sha256=SC_qV6grNTGh0QD1ubKrULQblrN-2PORocISlaZg9NQ,35156
 fastled/filewatcher.py,sha256=3qS3L7zMQhFuVrkeGn1djsB_cB6x_E2YGJmmQWVAU_w,10033
-fastled/interactive_srcs.py,sha256=F5nHdJc60xsnmOtnKhngE9JytqGn56PmYw_MVSIX1ac,138
 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/parse_args.py,sha256=lF63joIP2rN706n1rbxmBhWyogN91zjocyFtTVHOnds,9306
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
-fastled/print_filter.py,sha256=nepkG6UpBg3PX_fnN5It7uKbhppqAC_hYuh06RqJsUM,2120
+fastled/print_filter.py,sha256=ZpebuqfWEraSBD3Dm0PVZhQVBnU_NSILniwBHwjC1qM,2342
 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/settings.py,sha256=URgM6ZPlQYF-0ZTEhQCX8isLR6CbmYGwhDX4uXbh-ZI,468
+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
@@ -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.76.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.2.76.dist-info/METADATA,sha256=8C3qs-NQs8qb76ss0g-GC2bXqsNWPagZ-6w_un4v_r8,22065
-fastled-1.2.76.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-fastled-1.2.76.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.2.76.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
-fastled-1.2.76.dist-info/RECORD,,
+fastled-1.2.78.dist-info/licenses/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.2.78.dist-info/METADATA,sha256=vzbxAQY1Pvv7RNJOj_Fx1Cot8ReBujjBgYcoltrNis8,22065
+fastled-1.2.78.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+fastled-1.2.78.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.2.78.dist-info/top_level.txt,sha256=Bbv5kpJpZhWNCvDF4K0VcvtBSDMa8B7PTOrZa9CezHY,8
+fastled-1.2.78.dist-info/RECORD,,

fastled/interactive_srcs.py

@@ -1,5 +0,0 @@
-INTERACTIVE_SOURCES: list[str] = [
-    "/js/compiler/CMakeLists.txt",
-    "/js/compiler/build_archive.sh",
-    "/js/compiler/build.sh",
-]