@grame/faustwasm 0.1.0 → 0.1.1

package/package.json

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

package/src/FaustWebAudioDsp.ts

@@ -830,6 +830,18 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
         // Split the string into an array of strings and remove first and last characters
         return trimmed.split(";").map(str => str.length <= 2 ? '' : str.substring(1, str.length - 1));
     }
+
+    private extractURLsFromJSON(): string[] {
+        // Find the entry with the "soundfiles" key
+        const soundfilesEntry = this.fJSONDsp.meta.find(entry => entry.soundfiles !== undefined);
+        // If the entry is found, split the string by semicolon to get the URLs
+        if (soundfilesEntry) {
+            return soundfilesEntry.soundfiles.split(';').filter(url => url !== '');
+        } else {
+            return [];
+        }
+    }
+
     /**
      *  Load a soundfile possibly containing several parts. 
      * 
@@ -842,9 +854,11 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
 
         console.log(`Soundfile ${name} paths: ${url}`);
 
-        // Add standard directories to look for soundfiles
-        const sfDirectories: string[] = ["", ".", "http://127.0.0.1:8000"];
+        const sfReaderURLs = this.extractURLsFromJSON();
+        console.log(`sfReaderURLs ${sfReaderURLs}`);
 
+        const sfDirectories: string[] = ["", ".", "http://127.0.0.1:8000"];
+        sfDirectories.push(...sfReaderURLs);
         console.log(`sfDirectories ${sfDirectories}`);
 
         // Check if the soundfile exists in the given directories and return the real path

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

@@ -710,6 +710,7 @@ export declare class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
 	static parseItems(items: FaustUIItem[], callback: (item: FaustUIItem) => any): void;
 	static parseItem(item: FaustUIItem, callback: (item: FaustUIItem) => any): void;
 	static splitNames(input: string): string[];
+	private extractURLsFromJSON;
 	/**
 	 *  Load a soundfile possibly containing several parts.
 	 *

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

@@ -2306,9 +2306,20 @@ var FaustBaseWebAudioDsp = class {
     let trimmed = input.replace(/^\{|\}$/g, "");
     return trimmed.split(";").map((str) => str.length <= 2 ? "" : str.substring(1, str.length - 1));
   }
+  extractURLsFromJSON() {
+    const soundfilesEntry = this.fJSONDsp.meta.find((entry) => entry.soundfiles !== void 0);
+    if (soundfilesEntry) {
+      return soundfilesEntry.soundfiles.split(";").filter((url) => url !== "");
+    } else {
+      return [];
+    }
+  }
   async loadSoundfile(sfReader, sfOffset, name, url) {
     console.log(`Soundfile ${name} paths: ${url}`);
     const sfDirectories = ["", ".", "http://127.0.0.1:8000"];
+    const sfReaderURLs = this.extractURLsFromJSON();
+    console.log(`sfReaderURLs ${sfReaderURLs}`);
+    sfDirectories.push(...sfReaderURLs);
     console.log(`sfDirectories ${sfDirectories}`);
     const sfPathNames = await sfReader.checkFiles(sfDirectories, FaustBaseWebAudioDsp.splitNames(url));
     console.log(`Soundfile ${name} paths: ${sfPathNames}`);