fastled 1.2.77__tar.gz → 1.2.79__tar.gz

{fastled-1.2.77 → fastled-1.2.79}/PKG-INFO

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

fastled-1.2.79/compiler/init_runtime.py

@@ -0,0 +1,114 @@
+import glob
+import os
+import warnings
+from concurrent.futures import ThreadPoolExecutor
+from pathlib import Path
+
+COMPILER_ROOT = Path("/js")
+COMPILER_DIR = COMPILER_ROOT / "compiler"
+
+SRC_MAPPED_HOST_COMPLER_DIR = Path("/host/fastled/src/platforms/wasm/compiler")
+if SRC_MAPPED_HOST_COMPLER_DIR.exists():
+    FASTLED_COMPILER_DIR = SRC_MAPPED_HOST_COMPLER_DIR
+else:
+    FASTLED_COMPILER_DIR = COMPILER_ROOT / "fastled/src/platforms/wasm/compiler"
+
+HERE = Path(__file__).parent
+
+
+def symlink_task(src: str | Path, dst: Path) -> None:
+    src = Path(src)
+    # Handle shell scripts
+    if src.suffix == ".sh":
+        os.system(f"dos2unix {src} && chmod +x {src}")
+
+    # if link exists, remove it
+    if dst.exists():
+        print(f"Removing existing link {dst}")
+        try:
+            os.remove(dst)
+        except Exception as e:
+            warnings.warn(f"Failed to remove {dst}: {e}")
+
+    if not dst.exists():
+        print(f"Linking {src} to {dst}")
+        try:
+            os.symlink(str(src), str(dst))
+        except FileExistsError:
+            print(f"Target {dst} already exists")
+    else:
+        print(f"Target {dst} already exists")
+
+
+def _collect_docker_compile_files(globs: list[str]) -> list[tuple[Path, Path]]:
+    """
+    Collects files matching the given glob patterns from the Docker compile directory.
+    """
+    files = []
+    for pattern in globs:
+        for file_path in glob.glob(str(COMPILER_DIR / pattern)):
+            src = Path(file_path)
+            if "entrypoint.sh" in str(src):
+                continue
+            dst = COMPILER_ROOT / src.name
+            files.append((src, dst))
+    return files
+
+
+def _collect_fastled_compile_files(globs: list[str]) -> list[tuple[Path, Path]]:
+    """
+    Collects files matching the given glob patterns from the FastLED compile directory.
+    """
+    files = []
+    for pattern in globs:
+        for file_path in glob.glob(str(FASTLED_COMPILER_DIR / pattern)):
+            src = Path(file_path)
+            if "entrypoint.sh" in str(src):
+                continue
+            dst = COMPILER_ROOT / src.name
+            files.append((src, dst))
+    return files
+
+
+def make_links() -> None:
+    # Define file patterns to include
+    patterns = [
+        "*.h",
+        "*.hpp",
+        "*.cpp",
+        "*.py",
+        "*.sh",
+        "*.ino",
+        "*.ini",
+        "*.txt",
+    ]
+
+    # Get all matching files in compiler directory
+    tasks = _collect_docker_compile_files(globs=patterns)
+    tasks += _collect_fastled_compile_files(globs=patterns)
+
+    for pattern in patterns:
+        for file_path in glob.glob(str(FASTLED_COMPILER_DIR / pattern)):
+            src = Path(file_path)
+            if "entrypoint.sh" in str(src):
+                continue
+            dst = COMPILER_ROOT / src.name
+            tasks.append((src, dst))
+
+    # Process files in parallel using ThreadPoolExecutor
+    with ThreadPoolExecutor(max_workers=16) as executor:
+
+        def functor(args):
+            src, dst = args
+            symlink_task(src, dst)
+
+        executor.map(functor, tasks)
+
+
+def init_runtime() -> None:
+    os.chdir(str(HERE))
+    make_links()
+
+
+if __name__ == "__main__":
+    init_runtime()

fastled-1.2.77/compiler/init_runtime.py → fastled-1.2.79/compiler/init_runtime2.py

@@ -4,9 +4,17 @@ import warnings
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 
-COMPILER_ROOT = Path("/js")
-COMPILER_DIR = COMPILER_ROOT / "compiler"
-FASTLED_COMPILER_DIR = COMPILER_ROOT / "fastled/src/platforms/wasm/compiler"
+SRC_MAPPED_HOST_COMPLER_DIR = Path("/host/fastled/src/platforms/wasm/compiler")
+SRC_STANDARD_HOST_COMPILER_DIR = Path(
+    "/js/compiler/fastled/src/platforms/wasm/compiler"
+)
+
+COMPILER_TARGET = Path("/js")
+
+if SRC_MAPPED_HOST_COMPLER_DIR.exists():
+    SRC_COMPILER_DIR = SRC_MAPPED_HOST_COMPLER_DIR
+else:
+    SRC_COMPILER_DIR = SRC_STANDARD_HOST_COMPILER_DIR
 
 HERE = Path(__file__).parent
 
@@ -15,7 +23,7 @@ def copy_task(src: str | Path) -> None:
     src = Path(src)
     if "entrypoint.sh" in str(src):
         return
-    link_dst = COMPILER_ROOT / src.name
+    link_dst = COMPILER_TARGET / src.name
 
     # Handle shell scripts
     if src.suffix == ".sh":
@@ -55,10 +63,7 @@ def make_links() -> None:
     # Get all matching files in compiler directory
     files = []
     for pattern in patterns:
-        files.extend(glob.glob(str(COMPILER_DIR / pattern)))
-
-    for pattern in patterns:
-        files.extend(glob.glob(str(FASTLED_COMPILER_DIR / pattern)))
+        files.extend(glob.glob(str(SRC_COMPILER_DIR / pattern)))
 
     # Process files in parallel using ThreadPoolExecutor
     with ThreadPoolExecutor(max_workers=16) as executor:

{fastled-1.2.77 → fastled-1.2.79}/src/fastled/__init__.py

@@ -14,7 +14,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.77"
+__version__ = "1.2.79"
 
 
 class Api:

{fastled-1.2.77 → fastled-1.2.79}/src/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-1.2.77 → fastled-1.2.79}/src/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
@@ -43,7 +42,7 @@ def _port_is_free(port: int) -> bool:
 
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
         try:
-            sock.bind(("localhost", port)) and sock.bind(("0.0.0.0", port))
+            _ = sock.bind(("localhost", port)) and sock.bind(("0.0.0.0", port))
             return True
         except OSError:
             return False
@@ -269,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:

{fastled-1.2.77 → fastled-1.2.79}/src/fastled/parse_args.py

@@ -188,6 +188,9 @@ def parse_args() -> Args:
             if not args.build:
                 print("Adding --build flag when using --interactive")
                 args.build = True
+        user_wants_update = args.update
+        if user_wants_update is not True:
+            args.no_auto_updates = True
         return Args.from_namespace(args)
 
     if not args.update:

{fastled-1.2.77 → fastled-1.2.79}/src/fastled.egg-info/PKG-INFO

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

{fastled-1.2.77 → fastled-1.2.79}/src/fastled.egg-info/SOURCES.txt

@@ -44,6 +44,7 @@ compiler/compile_lock.py
 compiler/entrypoint.sh
 compiler/final_prewarm.sh
 compiler/init_runtime.py
+compiler/init_runtime2.py
 compiler/install-arduino-cli.sh
 compiler/paths.py
 compiler/pre-process.sh
@@ -71,7 +72,6 @@ src/fastled/compile_server.py
 src/fastled/compile_server_impl.py
 src/fastled/docker_manager.py
 src/fastled/filewatcher.py
-src/fastled/interactive_srcs.py
 src/fastled/keyboard.py
 src/fastled/keyz.py
 src/fastled/live_client.py

fastled-1.2.77/src/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",
-]