filly 0.2.0__tar.gz → 0.2.1__tar.gz

{filly-0.2.0 → filly-0.2.1}/.github/workflows/wheels.yml

@@ -32,19 +32,19 @@ jobs:
       matrix:
         os: [ubuntu-24.04, windows-2022]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v7
         with:
           python-version: '3.12'
       - name: Cache Linux SDK
         if: runner.os == 'Linux'
-        uses: actions/cache@v4
+        uses: actions/cache@v6
         with:
           path: .deps/filament-linux
           key: filament-linux-x86_64-manylinux228-${{ hashFiles('tools/build_filament_linux.py', 'tools/ci_linux.sh') }}
       - name: Cache Windows SDK
         if: runner.os == 'Windows'
-        uses: actions/cache@v4
+        uses: actions/cache@v6
         with:
           path: .deps
           key: filament-windows-x86_64-${{ hashFiles('tools/fetch_filament.py') }}
@@ -66,7 +66,7 @@ jobs:
       - name: Check extension imports
         shell: bash
         run: python tools/check_native_imports.py wheelhouse/*.whl
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: wheels-${{ matrix.os }}
           path: wheelhouse/*.whl
@@ -76,8 +76,8 @@ jobs:
     name: sdist
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v7
         with:
           python-version: '3.12'
       - name: Check that the tag matches the version
@@ -92,7 +92,7 @@ jobs:
               raise SystemExit(f"Tag {tag} does not match version {version} in pyproject.toml")
       - name: Build the sdist
         run: pipx run build --sdist
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: sdist
           path: dist/*.tar.gz
@@ -109,7 +109,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           path: dist
           merge-multiple: true
@@ -126,7 +126,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           path: dist
           merge-multiple: true

{filly-0.2.0 → filly-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: filly
-Version: 0.2.0
+Version: 0.2.1
 Summary: A Python 3D renderer for glTF scenes, built on Google Filament
 Author: Alex Forrence
 License-Expression: MIT

{filly-0.2.0 → filly-0.2.1}/docs/explanation/web.md

@@ -155,6 +155,10 @@ Firefox has no `KHR_parallel_shader_compile`. Filament then compiles at the firs
   `write(fn)`) keep only the bookkeeping.
 - Files load from memory: `loadUrl()` fetches a `.glb`, or a `.gltf` and the buffers and images
   it names, and writes them to Emscripten's in-memory file system for the load.
+- `filly.js` compiles `filly-core.wasm` while it downloads only if the server sends it as
+  `application/wasm`. Some static hosts, Pavlovia among them, send another type. Then
+  `filly.js` compiles the downloaded bytes. Emscripten's own loader would log an error and
+  download the file again.
 
 ## Output compared with the desktop
 

{filly-0.2.0 → filly-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "filly"
-version = "0.2.0"
+version = "0.2.1"
 description = "A Python 3D renderer for glTF scenes, built on Google Filament"
 readme = "README.md"
 license = "MIT"

{filly-0.2.0 → filly-0.2.1}/tests/test_web.py

@@ -108,8 +108,9 @@ def _web_build():
     return build
 
 
-def _run_page(browser, page, folder):
-    """Serve the web build, the pages, and tree.glb from folder; return the page's testResult."""
+def _run_page(browser, page, folder, wasm_type=None, report=False):
+    """Serve the web build, the pages, and tree.glb from folder; return the page's testResult,
+    or with `report`, also the console messages. `wasm_type`: the Content-Type of .wasm files."""
     executable = os.environ.get(f"FILLY_TEST_{browser.upper()}", EXECUTABLES.get(browser, ""))
     node = shutil.which("node")
     if not node:
@@ -128,12 +129,13 @@ def _run_page(browser, page, folder):
         (folder / "tree.glb").write_bytes(tree_glb())
         (folder / "instances.glb").write_bytes(instances_glb())
         shutil.copytree(ROOT / "tests" / "data" / "draco-box", folder / "draco-box")
-    result = subprocess.run([node, str(WEB / "run_page.mjs"), str(folder), page, browser, executable],
+    command = [node, str(WEB / "run_page.mjs"), str(folder), page, browser, executable]
+    result = subprocess.run(command + ([wasm_type] if wasm_type else []),
                             capture_output=True, text=True, timeout=300, cwd=WEB)
     assert result.returncode == 0, result.stderr[-3000:]
-    report = json.loads(result.stdout.strip().splitlines()[-1])
-    assert report["pageErrors"] == [], report["pageErrors"]
-    return report["result"]
+    output = json.loads(result.stdout.strip().splitlines()[-1])
+    assert output["pageErrors"] == [], output["pageErrors"]
+    return output if report else output["result"]
 
 
 @pytest.fixture(scope="module", params=BROWSERS)
@@ -390,6 +392,18 @@ def test_gpu_frame_time(page_results):
     assert large > 2 * small, value
 
 
+def test_wasm_without_wasm_type(browser_folder):
+    """A host that sends the .wasm file as application/octet-stream, as Pavlovia does: the module
+    loads without the console error and second download of Emscripten's fallback."""
+    browser, folder = browser_folder
+    output = _run_page(browser, "handover.html", folder, wasm_type="application/octet-stream",
+                       report=True)
+    assert output["consoleErrors"] == [], output["consoleErrors"]
+    warnings = [text for text in output["consoleWarnings"] if "wasm" in text.lower()]
+    assert warnings == [], warnings
+    assert output["result"]["readValues"]["width"] == 512
+
+
 def test_handover(handover_results):
     calls = handover_results["calls"]
     # Property reads after the hand-back leave the context with the page.

{filly-0.2.0 → filly-0.2.1}/tests/web/run_page.mjs

@@ -1,17 +1,18 @@
 // Serve a folder, open one page in a browser, and print the page's window.testResult as JSON.
 //
-// Usage: node run_page.mjs FOLDER PAGE BROWSER EXECUTABLE
+// Usage: node run_page.mjs FOLDER PAGE BROWSER EXECUTABLE [WASM_TYPE]
 //
 // The page sets window.testResult when it is done. Page errors and console errors are reported
-// with the result. The server sends no special headers.
+// with the result, and console warnings too. The server sends no special headers; WASM_TYPE
+// replaces the Content-Type of .wasm files (default application/wasm).
 import fs from "node:fs";
 import http from "node:http";
 import path from "node:path";
 import puppeteer from "puppeteer-core";
 
-const [folder, pageName, browserName, executable] = process.argv.slice(2);
+const [folder, pageName, browserName, executable, wasmType] = process.argv.slice(2);
 const types = { ".html": "text/html", ".mjs": "text/javascript", ".js": "text/javascript",
-	".wasm": "application/wasm", ".json": "application/json" };
+	".wasm": wasmType ?? "application/wasm", ".json": "application/json" };
 const server = http.createServer((request, response) =>
 {
 	const file = path.join(folder, decodeURIComponent(new URL(request.url, "http://host").pathname));
@@ -28,7 +29,7 @@ const server = http.createServer((request, response) =>
 	});
 }).listen(0);
 
-const report = { pageErrors: [], consoleErrors: [] };
+const report = { pageErrors: [], consoleErrors: [], consoleWarnings: [] };
 const browser = await puppeteer.launch({
 	executablePath: executable,
 	browser: browserName === "firefox" ? "firefox" : "chrome",
@@ -45,6 +46,10 @@ try
 		{
 			report.consoleErrors.push(message.text());
 		}
+		else if (message.type() === "warn")
+		{
+			report.consoleWarnings.push(message.text());
+		}
 	});
 	await page.goto(`http://localhost:${server.address().port}/${pageName}`);
 	await page.waitForFunction(() => window.testResult !== undefined, { timeout: 120000 });

{filly-0.2.0 → filly-0.2.1}/web/filly.js

@@ -48,11 +48,40 @@ let loadedModule = null;
 /** Load the WebAssembly module once per page. filly-core.wasm is resolved next to this file. */
 export function loadModule()
 {
-	modulePromise ??= createFillyModule({ locateFile: (file) => new URL(file, import.meta.url).href })
-		.then((module) => (loadedModule = module));
+	if (!modulePromise)
+	{
+		// Emscripten's instantiateWasm hook has no way to report a failure.
+		let fail;
+		const failed = new Promise((resolve, reject) => (fail = reject));
+		const created = createFillyModule({
+			locateFile: (file) => new URL(file, import.meta.url).href,
+			instantiateWasm: (imports, receive) =>
+			{
+				instantiateWasm(new URL("filly-core.wasm", import.meta.url).href, imports)
+					.then(({ instance, module }) => receive(instance, module), fail);
+				return {};
+			},
+		});
+		modulePromise = Promise.race([created, failed]).then((module) => (loadedModule = module));
+	}
 	return modulePromise;
 }
 
+// Static hosts, Pavlovia among them, can send .wasm files without the application/wasm type that
+// streaming compilation needs. Emscripten's loader then logs an error and fetches the file again.
+async function instantiateWasm(url, imports)
+{
+	const response = await fetch(url);
+	if (!response.ok)
+	{
+		throw new FillyError(`Could not fetch ${url}: ${response.status} ${response.statusText}`);
+	}
+	const type = response.headers.get("Content-Type")?.split(";")[0].trim();
+	return type === "application/wasm"
+		? WebAssembly.instantiateStreaming(response, imports)
+		: WebAssembly.instantiate(await response.arrayBuffer(), imports);
+}
+
 function moduleNow()
 {
 	if (!loadedModule)