fastled 1.1.3__py2.py3-none-any.whl → 1.1.6__py2.py3-none-any.whl

fastled/app.py

@@ -20,6 +20,7 @@ from fastled.compile_server import CompileServer, looks_like_fastled_repo
 from fastled.docker_manager import DockerManager
 from fastled.filewatcher import FileChangedNotifier
 from fastled.open_browser import open_browser_thread
+from fastled.sketch import get_sketch_files
 from fastled.web_compile import web_compile
 
 machine = platform.machine().lower()
@@ -210,12 +211,7 @@ def _try_start_server_or_get_url(args: argparse.Namespace) -> str | CompileServe
 
 
 def _lots_and_lots_of_files(directory: Path) -> bool:
-    count = 0
-    for root, dirs, files in os.walk(directory):
-        count += len(files)
-        if count > 100:
-            return True
-    return False
+    return len(get_sketch_files(directory)) > 100
 
 
 def _looks_like_sketch_directory(directory: Path) -> bool:

fastled/compile_server.py

@@ -151,7 +151,7 @@ class CompileServer:
                 f"Mounting FastLED source directory {self.fastled_src_dir} into container /js/fastled/src"
             )
             volumes = {
-                str(self.fastled_src_dir): {"bind": "/js/fastled/src", "mode": "rw"}
+                str(self.fastled_src_dir): {"bind": "/host/fastled/src", "mode": "ro"}
             }
             # no auto-update because the source directory is mapped in.
             server_command.append("--no-auto-update")  # stop git repo updates.

fastled/sketch.py

@@ -0,0 +1,18 @@
+import os
+from pathlib import Path
+
+
+def get_sketch_files(directory: Path) -> list[Path]:
+    files: list[Path] = []
+    for root, dirs, filenames in os.walk(directory):
+        # ignore hidden directories
+        dirs[:] = [d for d in dirs if not d.startswith(".")]
+        # ignore fastled_js directory
+        dirs[:] = [d for d in dirs if "fastled_js" not in d]
+        # ignore hidden files
+        filenames = [f for f in filenames if not f.startswith(".")]
+        for filename in filenames:
+            if "platformio.ini" in filename:
+                continue
+            files.append(Path(root) / filename)
+    return files

fastled/web_compile.py

@@ -1,5 +1,7 @@
+import io
 import shutil
 import tempfile
+import zipfile
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from dataclasses import dataclass
 from pathlib import Path
@@ -8,12 +10,15 @@ import httpx
 
 from fastled.build_mode import BuildMode
 from fastled.compile_server import SERVER_PORT
+from fastled.sketch import get_sketch_files
 
 DEFAULT_HOST = "https://fastled.onrender.com"
 ENDPOINT_COMPILED_WASM = "compile/wasm"
 _TIMEOUT = 60 * 4  # 2 mins timeout
 _AUTH_TOKEN = "oBOT5jbsO4ztgrpNsQwlmFLIKB"
 
+_THREAD_POOL = ThreadPoolExecutor(max_workers=8)
+
 
 @dataclass
 class TestConnectionResult:
@@ -58,7 +63,7 @@ def _test_connection(host: str, use_ipv4: bool) -> TestConnectionResult:
             transport=transport,
         ) as test_client:
             test_response = test_client.get(
-                f"{host}/healthz", timeout=_TIMEOUT, follow_redirects=True
+                f"{host}/healthz", timeout=3, follow_redirects=True
             )
             result = TestConnectionResult(
                 host, test_response.status_code == 200, use_ipv4
@@ -70,6 +75,27 @@ def _test_connection(host: str, use_ipv4: bool) -> TestConnectionResult:
     return result
 
 
+def zip_files(directory: Path) -> bytes | Exception:
+    print("Zipping files...")
+    try:
+        files = get_sketch_files(directory)
+        if not files:
+            raise FileNotFoundError(f"No files found in {directory}")
+        for f in files:
+            print(f"Adding file: {f}")
+        # Create in-memory zip file
+        zip_buffer = io.BytesIO()
+        with zipfile.ZipFile(
+            zip_buffer, "w", zipfile.ZIP_DEFLATED, compresslevel=9
+        ) as zip_file:
+            for file_path in files:
+                relative_path = file_path.relative_to(directory)
+                zip_file.write(file_path, str(Path("wasm") / relative_path))
+        return zip_buffer.getvalue()
+    except Exception as e:
+        return e
+
+
 def web_compile(
     directory: Path,
     host: str | None = None,
@@ -80,131 +106,117 @@ def web_compile(
     host = _sanitize_host(host or DEFAULT_HOST)
     print("Compiling on", host)
     auth_token = auth_token or _AUTH_TOKEN
-    # zip up the files
-    print("Zipping files...")
 
-    # Create a temporary zip file
-    with tempfile.NamedTemporaryFile(suffix=".zip", delete=False) as tmp_zip:
-        # Create temporary directory for organizing files
-        with tempfile.TemporaryDirectory() as temp_dir:
-            # Create wasm subdirectory
-            wasm_dir = Path(temp_dir) / "wasm"
-
-            # Copy all files from source to wasm subdirectory, excluding fastled_js
-            def ignore_fastled_js(dir: str, files: list[str]) -> list[str]:
-                if "fastled_js" in dir:
-                    return files
-                if dir.startswith("."):
-                    return files
-                return []
-
-            shutil.copytree(directory, wasm_dir, ignore=ignore_fastled_js)
-            # Create zip archive from the temp directory
-            shutil.make_archive(tmp_zip.name[:-4], "zip", temp_dir)
+    if not directory.exists():
+        raise FileNotFoundError(f"Directory not found: {directory}")
 
+    zip_bytes = zip_files(directory)
+    if isinstance(zip_bytes, Exception):
+        return WebCompileResult(
+            success=False, stdout=str(zip_bytes), hash_value=None, zip_bytes=b""
+        )
+    archive_size = len(zip_bytes)
     print(f"Web compiling on {host}...")
-
     try:
-        with open(tmp_zip.name, "rb") as zip_file:
-            files = {"file": ("wasm.zip", zip_file, "application/x-zip-compressed")}
-            urls = [host]
-            domain = host.split("://")[-1]
-            if ":" not in domain:
-                urls.append(f"{host}:{SERVER_PORT}")
-            test_connection_result: TestConnectionResult | None = None
-
-            with ThreadPoolExecutor(max_workers=len(urls)) as executor:
-                futures: list = []
-                ip_versions = [True, False] if "localhost" not in host else [True]
-                for ipv4 in ip_versions:
-                    for url in urls:
-                        f = executor.submit(_test_connection, url, ipv4)
-                        futures.append(f)
-
-                succeeded = False
-                for future in as_completed(futures):
-                    result: TestConnectionResult = future.result()
-
-                    if result.success:
-                        print(f"Connection successful to {result.host}")
-                        succeeded = True
-                        # host = test_url
-                        test_connection_result = result
-                        break
-                    else:
-                        print(f"Ignoring {result.host} due to connection failure")
-
-                if not succeeded:
-                    print("Connection failed to all endpoints")
-                    return WebCompileResult(
-                        success=False,
-                        stdout="Connection failed",
-                        hash_value=None,
-                        zip_bytes=b"",
-                    )
-            assert test_connection_result is not None
-            ipv4_stmt = "IPv4" if test_connection_result.ipv4 else "IPv6"
-            transport = (
-                httpx.HTTPTransport(local_address="0.0.0.0")
-                if test_connection_result.ipv4
-                else None
+
+        files = {"file": ("wasm.zip", zip_bytes, "application/x-zip-compressed")}
+        urls = [host]
+        domain = host.split("://")[-1]
+        if ":" not in domain:
+            urls.append(f"{host}:{SERVER_PORT}")
+        test_connection_result: TestConnectionResult | None = None
+
+        futures: list = []
+        ip_versions = [True, False] if "localhost" not in host else [True]
+        for ipv4 in ip_versions:
+            for url in urls:
+                f = _THREAD_POOL.submit(_test_connection, url, ipv4)
+                futures.append(f)
+
+        succeeded = False
+        for future in as_completed(futures):
+            result: TestConnectionResult = future.result()
+
+            if result.success:
+                print(f"Connection successful to {result.host}")
+                succeeded = True
+                # host = test_url
+                test_connection_result = result
+                break
+            else:
+                print(f"Ignoring {result.host} due to connection failure")
+
+        if not succeeded:
+            print("Connection failed to all endpoints")
+            return WebCompileResult(
+                success=False,
+                stdout="Connection failed",
+                hash_value=None,
+                zip_bytes=b"",
             )
-            with httpx.Client(
-                transport=transport,
+        assert test_connection_result is not None
+        ipv4_stmt = "IPv4" if test_connection_result.ipv4 else "IPv6"
+        transport = (
+            httpx.HTTPTransport(local_address="0.0.0.0")
+            if test_connection_result.ipv4
+            else None
+        )
+        with httpx.Client(
+            transport=transport,
+            timeout=_TIMEOUT,
+        ) as client:
+            headers = {
+                "accept": "application/json",
+                "authorization": auth_token,
+                "build": (
+                    build_mode.value.lower()
+                    if build_mode
+                    else BuildMode.QUICK.value.lower()
+                ),
+                "profile": "true" if profile else "false",
+            }
+
+            url = f"{test_connection_result.host}/{ENDPOINT_COMPILED_WASM}"
+            print(f"Compiling on {url} via {ipv4_stmt}. Zip size: {archive_size} bytes")
+            response = client.post(
+                url,
+                follow_redirects=True,
+                files=files,
+                headers=headers,
                 timeout=_TIMEOUT,
-            ) as client:
-                headers = {
-                    "accept": "application/json",
-                    "authorization": auth_token,
-                    "build": (
-                        build_mode.value.lower()
-                        if build_mode
-                        else BuildMode.QUICK.value.lower()
-                    ),
-                    "profile": "true" if profile else "false",
-                }
-
-                url = f"{test_connection_result.host}/{ENDPOINT_COMPILED_WASM}"
-                print(f"Compiling on {url} via {ipv4_stmt}")
-                response = client.post(
-                    url,
-                    follow_redirects=True,
-                    files=files,
-                    headers=headers,
-                    timeout=_TIMEOUT,
+            )
+
+            if response.status_code != 200:
+                json_response = response.json()
+                detail = json_response.get("detail", "Could not compile")
+                return WebCompileResult(
+                    success=False, stdout=detail, hash_value=None, zip_bytes=b""
                 )
 
-                if response.status_code != 200:
-                    json_response = response.json()
-                    detail = json_response.get("detail", "Could not compile")
-                    return WebCompileResult(
-                        success=False, stdout=detail, hash_value=None, zip_bytes=b""
-                    )
-
-                print(f"Response status code: {response}")
-                # Create a temporary directory to extract the zip
-                with tempfile.TemporaryDirectory() as extract_dir:
-                    extract_path = Path(extract_dir)
-
-                    # Write the response content to a temporary zip file
-                    temp_zip = extract_path / "response.zip"
-                    temp_zip.write_bytes(response.content)
-
-                    # Extract the zip
-                    shutil.unpack_archive(temp_zip, extract_path, "zip")
-
-                    # Read stdout from out.txt if it exists
-                    stdout_file = extract_path / "out.txt"
-                    hash_file = extract_path / "hash.txt"
-                    stdout = stdout_file.read_text() if stdout_file.exists() else ""
-                    hash_value = hash_file.read_text() if hash_file.exists() else None
-
-                    return WebCompileResult(
-                        success=True,
-                        stdout=stdout,
-                        hash_value=hash_value,
-                        zip_bytes=response.content,
-                    )
+            print(f"Response status code: {response}")
+            # Create a temporary directory to extract the zip
+            with tempfile.TemporaryDirectory() as extract_dir:
+                extract_path = Path(extract_dir)
+
+                # Write the response content to a temporary zip file
+                temp_zip = extract_path / "response.zip"
+                temp_zip.write_bytes(response.content)
+
+                # Extract the zip
+                shutil.unpack_archive(temp_zip, extract_path, "zip")
+
+                # Read stdout from out.txt if it exists
+                stdout_file = extract_path / "out.txt"
+                hash_file = extract_path / "hash.txt"
+                stdout = stdout_file.read_text() if stdout_file.exists() else ""
+                hash_value = hash_file.read_text() if hash_file.exists() else None
+
+                return WebCompileResult(
+                    success=True,
+                    stdout=stdout,
+                    hash_value=hash_value,
+                    zip_bytes=response.content,
+                )
     except KeyboardInterrupt:
         print("Keyboard interrupt")
         raise
@@ -213,8 +225,3 @@ def web_compile(
         return WebCompileResult(
             success=False, stdout=str(e), hash_value=None, zip_bytes=b""
         )
-    finally:
-        try:
-            Path(tmp_zip.name).unlink()
-        except PermissionError:
-            print("Warning: Could not delete temporary zip file")

{fastled-1.1.3.dist-info → fastled-1.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.3
+Version: 1.1.6
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -91,6 +91,9 @@ provide shims for most of the common api points.
 
 # Revisions
 
+  * 1.1.6 - Use the fast src volume map allow quick updates to fastled when developing on the source code.
+  * 1.1.5 - Filter out hidden files and directories from being included in the sketch archive sent to the compiler.
+  * 1.1.4 - Fix regression introduced by testing out ipv4/ipv6 connections from a thread pool.
   * 1.1.3 - Live editing of *.h and *.cpp files is now possible. Sketch cache will be disabled in this mode.
   * 1.1.2 - `--server` will now volume map fastled src directory if it detects this. This was also implemented on the docker side.
   * 1.1.1 - `--interactive` is now supported to debug the container. Volume maps and better compatibilty with ipv4/v6 by concurrent connection finding.

{fastled-1.1.3.dist-info → fastled-1.1.6.dist-info}/RECORD

@@ -1,18 +1,19 @@
 fastled/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastled/app.py,sha256=duSkE31cggy363rFZRHjKIzc0ijCA_TmmPXOLAj-jEM,13560
+fastled/app.py,sha256=Y3c2rEPKz-O0VBqKJoR9tBWJktzTGuYzRL93SkkwSHw,13498
 fastled/build_mode.py,sha256=joMwsV4K1y_LijT4gEAcjx69RZBoe_KmFmHZdPYbL_4,631
 fastled/check_cpp_syntax.py,sha256=YxRJm7cFPv4bdhL1v_KOkBz8RL86ihayoJYvclr69ms,1024
 fastled/cli.py,sha256=CNR_pQR0sNVPNuv8e_nmm-0PI8sU-eUBUgnWgWkzW9c,237
-fastled/compile_server.py,sha256=QqxTWYmC_Fej-hTNRjfa8qjyGusLY6L858zwTciC9AM,9903
+fastled/compile_server.py,sha256=HuJFPNdl6noE4mEl--wXLmM9rbqJUtPy8GdGRlS8MYQ,9905
 fastled/docker_manager.py,sha256=WcOKa3EpIPAjICPfTL87CUYuAmX9KYT6L_Hcqbj95eE,9028
 fastled/filewatcher.py,sha256=SHKx9Dnt4EJiT-iPYakdPZBRIL1gsJGN9tY8FJW2myU,5079
 fastled/open_browser.py,sha256=-VhpGmydwLCcXmrDD2esMEdJPZYcoX2Mt73eb88Nna0,1392
 fastled/paths.py,sha256=VsPmgu0lNSCFOoEC0BsTYzDygXqy15AHUfN-tTuzDZA,99
-fastled/web_compile.py,sha256=rCMClX8yUtZlAzrgFB-r5Pdt7l9TJWhHXe-u99Hmdvw,8257
+fastled/sketch.py,sha256=jdUlg8Cp2rwDT4U63wlRuuqN-oy3KtswDwt4uLPIPAk,634
+fastled/web_compile.py,sha256=vVQ68lldGo3CaQcYGf3lh9yU6K_A3zP1gNJ29pi5J-E,7857
 fastled/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
-fastled-1.1.3.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-fastled-1.1.3.dist-info/METADATA,sha256=C2OkZwJd57L96Gauxz_CZKMmk7bmNlv_VhvghbFdMD8,5687
-fastled-1.1.3.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
-fastled-1.1.3.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
-fastled-1.1.3.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
-fastled-1.1.3.dist-info/RECORD,,
+fastled-1.1.6.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+fastled-1.1.6.dist-info/METADATA,sha256=oVzJY4HN-L-F0pzZreoJerD-pA1Y_I3bNKS2Uxm-2rc,6008
+fastled-1.1.6.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+fastled-1.1.6.dist-info/entry_points.txt,sha256=RCwmzCSOS4-C2i9EziANq7Z2Zb4KFnEMR1FQC0bBwAw,101
+fastled-1.1.6.dist-info/top_level.txt,sha256=xfG6Z_ol9V5YmBROkZq2QTRwjbS2ouCUxaTJsOwfkOo,14
+fastled-1.1.6.dist-info/RECORD,,