@grame/faustwasm 0.15.6 → 0.15.7

package/package.json

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

package/src/FaustOfflineProcessor.ts

@@ -273,7 +273,7 @@ export class FaustOfflineProcessor<Poly extends boolean = false> {
                     outputs[i].set(output, l);
                 }
             }
-            l += this.fBufferSize;
+            l += sliceLength;
             onUpdate?.(l);
         }
         // The node can be stopped after rendering

package/src/FaustWebAudioDsp.ts

@@ -1040,7 +1040,9 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
             .split(';')
             .map((str) =>
                 str.length <= 2 ? '' : str.substring(1, str.length - 1)
-            );
+            )
+            .map((str) => str.trim())
+            .filter((str) => str.length > 0);
     }
 
     get hasAccInput() {

package/src/SoundfileReader.ts

@@ -64,32 +64,13 @@ class SoundfileReader {
             if (item.type === 'soundfile') {
                 const urls = FaustBaseWebAudioDsp.splitSoundfileNames(item.url);
                 // soundfiles.map[item.label] = urls;
-                urls.forEach((url) => (soundfiles[url] = null));
+                urls.filter((url) => url.trim().length > 0)
+                    .forEach((url) => (soundfiles[url] = null));
             }
         };
         FaustBaseWebAudioDsp.parseUI(dspMeta.ui, callback);
         return soundfiles;
     }
-    /**
-     * Check if the file exists.
-     *
-     * @param url : the url of the file to check
-     * @returns : true if the file exists, otherwise false
-     */
-    private static async checkFileExists(url: string): Promise<boolean> {
-        try {
-            console.log(`"checkFileExists" url: ${url}`);
-            // 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);
-            return false;
-        }
-    }
-
     /**
      * Fetch the soundfile.
      *
@@ -136,17 +117,21 @@ class SoundfileReader {
                         .href
             )
         ];
-        const checkResults = await Promise.all(
-            urlsToCheck.map((url) => this.checkFileExists(url))
-        );
-        const successIndex = checkResults.findIndex((r) => !!r);
-        if (successIndex === -1)
-            throw new Error(
-                `Failed to load sound file ${filename}, all check failed.`
-            );
-        soundfiles![filename] = await this.fetchSoundfile(
-            urlsToCheck[successIndex],
-            audioCtx
+        // Try each candidate once to avoid double downloads (no preflight GET).
+        let lastError: unknown = null;
+        for (const url of urlsToCheck) {
+            try {
+                soundfiles![filename] = await this.fetchSoundfile(
+                    url,
+                    audioCtx
+                );
+                return;
+            } catch (error) {
+                lastError = error;
+            }
+        }
+        throw new Error(
+            `Failed to load sound file ${filename}, all check failed. Last error: ${String(lastError)}`
         );
     }
 

package/src/faust2wavFiles.js

@@ -52,7 +52,12 @@ const faust2wavFiles = async (
     let input = undefined;
     if (inputWav) {
         console.log(`Reading input wav file ${inputWav}.`);
-        const inputBuffer = fs.readFileSync(inputWav).buffer;
+        const inputBufferView = fs.readFileSync(inputWav);
+        // Slice to the exact Buffer view to avoid extra bytes from the backing ArrayBuffer.
+        const inputBuffer = inputBufferView.buffer.slice(
+            inputBufferView.byteOffset,
+            inputBufferView.byteOffset + inputBufferView.byteLength
+        );
         console.log(`Decoding...`);
         input = WavDecoder.decode(inputBuffer).channelData;
     }

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

@@ -1378,13 +1378,6 @@ export declare class SoundfileReader {
 	 * @returns : the URLs
 	 */
 	static findSoundfilesFromMeta(dspMeta: FaustDspMeta): LooseFaustDspFactory["soundfiles"];
-	/**
-	 * Check if the file exists.
-	 *
-	 * @param url : the url of the file to check
-	 * @returns : true if the file exists, otherwise false
-	 */
-	private static checkFileExists;
 	/**
 	 * Fetch the soundfile.
 	 *

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

@@ -2712,7 +2712,7 @@ var FaustBaseWebAudioDsp = class _FaustBaseWebAudioDsp {
     const trimmed = input.replace(/^\{|\}$/g, "");
     return trimmed.split(";").map(
       (str) => str.length <= 2 ? "" : str.substring(1, str.length - 1)
-    );
+    ).map((str) => str.trim()).filter((str) => str.length > 0);
   }
   get hasAccInput() {
     return this.fAcc.x.length + this.fAcc.y.length + this.fAcc.z.length > 0;
@@ -3973,7 +3973,7 @@ var FaustOfflineProcessor = class {
           outputs[i].set(output, l);
         }
       }
-      l += this.fBufferSize;
+      l += sliceLength;
       onUpdate == null ? void 0 : onUpdate(l);
     }
     this.fDSPCode.stop();
@@ -4522,29 +4522,12 @@ var SoundfileReader = class {
     const callback = (item) => {
       if (item.type === "soundfile") {
         const urls = FaustBaseWebAudioDsp.splitSoundfileNames(item.url);
-        urls.forEach((url) => soundfiles[url] = null);
+        urls.filter((url) => url.trim().length > 0).forEach((url) => soundfiles[url] = null);
       }
     };
     FaustBaseWebAudioDsp.parseUI(dspMeta.ui, callback);
     return soundfiles;
   }
-  /**
-   * Check if the file exists.
-   *
-   * @param url : the url of the file to check
-   * @returns : true if the file exists, otherwise false
-   */
-  static async checkFileExists(url) {
-    try {
-      console.log(`"checkFileExists" url: ${url}`);
-      const response = await fetch(url);
-      console.log(`"checkFileExists" response.ok: ${response.ok}`);
-      return response.ok;
-    } catch (error) {
-      console.error("Fetch error:", error);
-      return false;
-    }
-  }
   /**
    * Fetch the soundfile.
    *
@@ -4579,17 +4562,20 @@ var SoundfileReader = class {
         (path) => new URL(filename, path.endsWith("/") ? path : `${path}/`).href
       )
     ];
-    const checkResults = await Promise.all(
-      urlsToCheck.map((url) => this.checkFileExists(url))
-    );
-    const successIndex = checkResults.findIndex((r) => !!r);
-    if (successIndex === -1)
-      throw new Error(
-        `Failed to load sound file ${filename}, all check failed.`
-      );
-    soundfiles[filename] = await this.fetchSoundfile(
-      urlsToCheck[successIndex],
-      audioCtx
+    let lastError = null;
+    for (const url of urlsToCheck) {
+      try {
+        soundfiles[filename] = await this.fetchSoundfile(
+          url,
+          audioCtx
+        );
+        return;
+      } catch (error) {
+        lastError = error;
+      }
+    }
+    throw new Error(
+      `Failed to load sound file ${filename}, all check failed. Last error: ${String(lastError)}`
     );
   }
   /**