@grame/faustwasm 0.3.2 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grame/faustwasm",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "WebAssembly version of Faust Compiler",
   "main": "dist/cjs/index.js",
   "types": "dist/esm/index.d.ts",

package/src/FaustAudioWorkletNode.ts

@@ -76,8 +76,6 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
     async listenSensors() {
         if (this.hasAccInput) {
             const isAndroid: boolean = /Android/i.test(navigator.userAgent);
-            console.log(navigator.userAgent);
-            console.log(isAndroid);
             let handleDeviceMotion = null;
             if (isAndroid) {
                 handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
@@ -242,7 +240,6 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
         this.port.postMessage({ type: "destroy" });
         this.port.close();
     }
-
 }
 
 /**

package/src/SoundfileReader.ts

@@ -3,7 +3,18 @@ import type { AudioData, FaustDspMeta, FaustUIItem, LooseFaustDspFactory } from
 
 /** Read metadata and fetch soundfiles */
 class SoundfileReader {
-    static get fallbackPaths() { return [location.href, location.origin]; }
+
+    // Set the fallback paths
+    static get fallbackPaths() { return [location.href, this.getParentUrl(location.href), location.origin]; }
+
+    /**
+     * Extract the parent URL from an URL.
+     * @param url : the URL
+     * @returns : the parent URL
+     */
+    private static getParentUrl(url: string) {
+        return url.substring(0, url.lastIndexOf('/') + 1);
+    }
 
     /**
      * Convert an audio buffer to audio data.
@@ -46,7 +57,10 @@ class SoundfileReader {
     private static async checkFileExists(url: string): Promise<boolean> {
         try {
             console.log(`"checkFileExists" url: ${url}`);
-            const response = await fetch(url, { method: "HEAD" });
+            // Fetch in "HEAD" mode does not properly work with the service-worker.js cache, so use "GET" mode for now
+            //const response = await fetch(url, { method: "HEAD" });
+            const response = await fetch(url);
+            console.log(`"checkFileExists" response.ok: ${response.ok}`);
             return response.ok; // Will be true if the status code is 200-299
         } catch (error) {
             console.error('Fetch error:', error);

package/src/copyWebStandaloneAssets.js

@@ -22,13 +22,23 @@ const copyWebStandaloneAssets = (outputDir, dspName, poly = false) => {
     cpSyncModify(templateJSPath, outputDir + `/${dspName}.js`, "FAUST_DSP", dspName);
 
     const templateHTMLPath = path.join(__dirname, "../assets/standalone/index.html");
-    cpSyncModify(templateHTMLPath, outputDir + `/${dspName}.html`, "FAUST_DSP", dspName);
+    //cpSyncModify(templateHTMLPath, outputDir + `/${dspName}.html`, "FAUST_DSP", dspName);
+    cpSyncModify(templateHTMLPath, outputDir + `/index.html`, "FAUST_DSP", dspName);
+
+    const templateServerJSPath = path.join(__dirname, "../assets/standalone/service-worker.js");
+    cpSyncModify(templateServerJSPath, outputDir + `/service-worker.js`, "FAUST_DSP", dspName);
+
+    const templateIconPath = path.join(__dirname, "../assets/standalone/icon.png");
+    cpSync(templateIconPath, outputDir + `/icon.png`);
 
     const faustwasmPath = path.join(__dirname, "../assets/standalone/faustwasm");
     cpSync(faustwasmPath, outputDir + "/faustwasm");
 
     const faustuiPath = path.join(__dirname, "../assets/standalone/faust-ui");
     cpSync(faustuiPath, outputDir + "/faust-ui");
+
+    const templateManifestPath = path.join(__dirname, "../assets/standalone/manifest.json");
+    cpSyncModify(templateManifestPath, outputDir + `/manifest.json`, "FAUST_DSP", dspName);
 };
 
 /**

package/test/faustlive-wasm/faustwasm/index.d.ts

@@ -1211,6 +1211,12 @@ export declare class WavDecoder {
 /** Read metadata and fetch soundfiles */
 export declare class SoundfileReader {
 	static get fallbackPaths(): string[];
+	/**
+	 * Extract the parent URL from an URL.
+	 * @param url : the URL
+	 * @returns : the parent URL
+	 */
+	private static getParentUrl;
 	/**
 	 * Convert an audio buffer to audio data.
 	 *

package/test/faustlive-wasm/faustwasm/index.js

@@ -3496,8 +3496,17 @@ var WavDecoder_default = WavDecoder;
 
 // src/SoundfileReader.ts
 var SoundfileReader = class {
+  // Set the fallback paths
   static get fallbackPaths() {
-    return [location.href, location.origin];
+    return [location.href, this.getParentUrl(location.href), location.origin];
+  }
+  /**
+   * Extract the parent URL from an URL.
+   * @param url : the URL
+   * @returns : the parent URL
+   */
+  static getParentUrl(url) {
+    return url.substring(0, url.lastIndexOf("/") + 1);
   }
   /**
    * Convert an audio buffer to audio data.
@@ -3538,7 +3547,8 @@ var SoundfileReader = class {
   static async checkFileExists(url) {
     try {
       console.log(`"checkFileExists" url: ${url}`);
-      const response = await fetch(url, { method: "HEAD" });
+      const response = await fetch(url);
+      console.log(`"checkFileExists" response.ok: ${response.ok}`);
       return response.ok;
     } catch (error) {
       console.error("Fetch error:", error);
@@ -3659,8 +3669,6 @@ var FaustAudioWorkletNode = class extends (globalThis.AudioWorkletNode || null)
   async listenSensors() {
     if (this.hasAccInput) {
       const isAndroid = /Android/i.test(navigator.userAgent);
-      console.log(navigator.userAgent);
-      console.log(isAndroid);
       let handleDeviceMotion = null;
       if (isAndroid) {
         handleDeviceMotion = ({ accelerationIncludingGravity }) => {