@grame/faustwasm 0.1.7 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grame/faustwasm",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "description": "WebAssembly version of Faust Compiler",
   "main": "dist/cjs/index.js",
   "types": "dist/esm/index.d.ts",
@@ -9,9 +9,9 @@
   "scripts": {
     "build": "npm run build-cjs && npm run build-cjs-bundle && npm run build-esm && npm run build-esm-bundle && node postbuild-bundled.js & npm run build-types & npm run build-types-bundle",
     "build-cjs": "esbuild src/index.ts --target=es2019 --bundle --sourcemap --outdir=dist/cjs --format=iife --external:fs --external:url",
-    "build-cjs-bundle": "node prebuild-bundled.js && esbuild src/index-bundle-iife.ts --target=es2019 --bundle --sourcemap --loader:.wasm=binary --loader:.data=binary --outfile=dist/cjs-bundle/index.js --format=iife --external:fs --external:url --external:path && node postbuild-bundled.js",
+    "build-cjs-bundle": "node prebuild-bundled.js && esbuild src/index-bundle-iife.ts --target=es2019 --bundle --sourcemap --loader:.wasm=binary --loader:.data=binary --outfile=dist/cjs-bundle/index.js --format=iife --external:fs --external:url --external:path --external:ws && node postbuild-bundled.js",
     "build-esm": "esbuild src/index.ts --target=es2019 --bundle --sourcemap --outdir=dist/esm --format=esm --external:fs --external:url",
-    "build-esm-bundle": "node prebuild-bundled.js && esbuild src/index-bundle.ts --target=es2019 --bundle --sourcemap --loader:.wasm=binary --loader:.data=binary --outfile=dist/esm-bundle/index.js --format=esm --external:fs --external:url --external:path && node postbuild-bundled.js",
+    "build-esm-bundle": "node prebuild-bundled.js && esbuild src/index-bundle.ts --target=es2019 --bundle --sourcemap --loader:.wasm=binary --loader:.data=binary --outfile=dist/esm-bundle/index.js --format=esm --external:fs --external:url --external:path --external:ws && node postbuild-bundled.js",
     "build-types": "dts-bundle-generator -o dist/cjs/index.d.ts src/index.ts --external-imports",
     "build-types-bundle": "dts-bundle-generator -o dist/cjs-bundle/index.d.ts src/index-bundle.ts --external-imports",
     "postbuild": "node postbuild.js"
@@ -27,9 +27,9 @@
     "signal processing"
   ],
   "bin": {
-      "faust2sndfile-ts": "scripts/faust2sndfile.js",
-      "faust2svg-ts": "scripts/faust2svg.js",
-      "faust2wasm-ts": "scripts/faust2wasm.js"
+    "faust2sndfile-ts": "scripts/faust2sndfile.js",
+    "faust2svg-ts": "scripts/faust2svg.js",
+    "faust2wasm-ts": "scripts/faust2wasm.js"
   },
   "author": "Grame-CNCM",
   "license": "LGPL-3.0",
@@ -37,16 +37,16 @@
     "url": "https://github.com/grame-cncm/faustwasm/issues"
   },
   "homepage": "https://github.com/grame-cncm/faustwasm#readme",
-  "dependencies": {
-    "@types/emscripten": "^1.39.5"
-  },
   "devDependencies": {
-    "@aws-crypto/sha256-js": "^2.0.1",
+    "@aws-crypto/sha256-js": "^5.2.0",
     "@shren/faust-ui": "^1.1.9",
-    "@types/node": "^16.11.7",
-    "@types/webmidi": "^2.0.6",
-    "dts-bundle-generator": "^6.13.0",
-    "esbuild": "^0.14.27",
-    "typescript": "^4.4.4"
+    "@types/node": "^20.12.7",
+    "@types/webmidi": "^2.0.10",
+    "dts-bundle-generator": "^9.5.1",
+    "esbuild": "^0.20.2",
+    "typescript": "^5.4.5"
+  },
+  "dependencies": {
+    "@types/emscripten": "^1.39.10"
   }
 }

package/src/FaustAudioWorkletProcessor.ts

@@ -190,13 +190,7 @@ const getFaustAudioWorkletProcessor = <Poly extends boolean = false>(dependencie
             const instance = FaustWasmInstantiator.createSyncMonoDSPInstance(factory);
 
             // Create Monophonic DSP
-            this.fDSPCode = new FaustMonoWebAudioDsp(instance, sampleRate, sampleSize, 128);
-
-            // Check for soundfile support
-            if (this.fDSPCode.hasSoundfiles()) {
-                console.error("FaustAudioWorkletProcessor: Soundfile support is not implemented yet, switch to ScriptProcessorNode for now");
-                return;
-            }
+            this.fDSPCode = new FaustMonoWebAudioDsp(instance, sampleRate, sampleSize, 128, factory.soundfiles);
 
             // Setup output handler
             this.fDSPCode.setOutputParamHandler((path, value) => this.port.postMessage({ path, value, type: "param" }));
@@ -218,14 +212,9 @@ const getFaustAudioWorkletProcessor = <Poly extends boolean = false>(dependencie
 
             const instance = FaustWasmInstantiator.createSyncPolyDSPInstance(voiceFactory, mixerModule, voices, effectFactory);
 
+            const soundfiles = { ...effectFactory?.soundfiles, ...voiceFactory.soundfiles };
             // Create Polyphonic DSP
-            this.fDSPCode = new FaustPolyWebAudioDsp(instance, sampleRate, sampleSize, 128);
-
-            // Check for soundfile support
-            if (this.fDSPCode.hasSoundfiles()) {
-                console.error("FaustAudioWorkletProcessor: Soundfile support is not implemented yet, switch to ScriptProcessorNode for now");
-                return;
-            }
+            this.fDSPCode = new FaustPolyWebAudioDsp(instance, sampleRate, sampleSize, 128, soundfiles);
 
             // Setup port message handling
             this.port.onmessage = (e: MessageEvent) => this.handleMessageAux(e);

package/src/FaustCmajor.ts

@@ -1,4 +1,4 @@
-import type LibFaust from "./LibFaust";
+import type FaustCompiler from "./FaustCompiler";
 
 interface IFaustCmajor {
     /**
@@ -13,15 +13,15 @@ interface IFaustCmajor {
 }
 
 class FaustCmajor implements IFaustCmajor {
-    private fLibFaust: LibFaust;
+    private fCompiler: FaustCompiler;
 
-    constructor(libfaust: LibFaust) {
-        this.fLibFaust = libfaust;
+    constructor(compiler: FaustCompiler) {
+        this.fCompiler = compiler;
     }
 
     compile(name: string, code: string, args: string) {
-        const fs = this.fLibFaust.fs();
-        const success = this.fLibFaust.generateAuxFiles(name, code, `-lang cmajor-hybrid -cn ${name} -o ${name}.cmajor`);
+        const fs = this.fCompiler.fs();
+        const success = this.fCompiler.generateAuxFiles(name, code, `-lang cmajor-hybrid -cn ${name} -o ${name}.cmajor`);
         return (success) ? fs.readFile(`${name}.cmajor`, { encoding: "utf8" }) as string : "";
     }
 }

package/src/FaustCompiler.ts

@@ -127,7 +127,7 @@ class FaustCompiler implements IFaustCompiler {
             const factory = table[shaKey];
             const { code, json, poly } = factory;
             const ab = str2ab(atob(code))
-            awaited.push(WebAssembly.compile(ab).then(module => this.gFactories.set(shaKey, { shaKey, cfactory: 0, code: ab, module, json: JSON.stringify(json), poly })));
+            awaited.push(WebAssembly.compile(ab).then(module => this.gFactories.set(shaKey, { shaKey, cfactory: 0, code: ab, module, json: JSON.stringify(json), poly, soundfiles: {} })));
         }
         return Promise.all(awaited);
     }
@@ -167,7 +167,7 @@ class FaustCompiler implements IFaustCompiler {
                 const ui8Code = this.intVec2intArray(faustDspWasm.data);
                 faustDspWasm.data.delete();
                 const module = await WebAssembly.compile(ui8Code);
-                const factory: FaustDspFactory = { shaKey, cfactory: faustDspWasm.cfactory, code: ui8Code, module, json: faustDspWasm.json, poly };
+                const factory: FaustDspFactory = { shaKey, cfactory: faustDspWasm.cfactory, code: ui8Code, module, json: faustDspWasm.json, poly, soundfiles: {} };
                 // Factory C++ side can be deallocated immediately
                 this.deleteDSPFactory(factory);
                 // Keep the compiled factory in the cache

package/src/FaustDspGenerator.ts

@@ -5,11 +5,26 @@ import { FaustDspInstance } from "./FaustDspInstance";
 import FaustWasmInstantiator from "./FaustWasmInstantiator";
 import { FaustMonoOfflineProcessor, FaustPolyOfflineProcessor, IFaustMonoOfflineProcessor, IFaustPolyOfflineProcessor } from "./FaustOfflineProcessor";
 import { FaustMonoScriptProcessorNode, FaustPolyScriptProcessorNode } from "./FaustScriptProcessorNode";
-import { FaustBaseWebAudioDsp, FaustMonoWebAudioDsp, FaustPolyWebAudioDsp, FaustWebAudioDspVoice, IFaustMonoWebAudioNode, IFaustPolyWebAudioNode } from "./FaustWebAudioDsp";
+import { FaustBaseWebAudioDsp, FaustMonoWebAudioDsp, FaustPolyWebAudioDsp, FaustWebAudioDspVoice, IFaustMonoWebAudioNode, IFaustPolyWebAudioNode, Soundfile, WasmAllocator } from "./FaustWebAudioDsp";
 import type { IFaustCompiler } from "./FaustCompiler";
-import type { FaustDspFactory, FaustUIDescriptor, FaustDspMeta, FFTUtils, LooseFaustDspFactory } from "./types";
+import type { FaustDspFactory, FaustUIDescriptor, FaustDspMeta, FFTUtils, LooseFaustDspFactory, AudioData } from "./types";
+import SoundfileReader from "./SoundfileReader";
 
-export interface IFaustMonoDspGenerator {
+export interface GeneratorSupportingSoundfiles {
+    /**
+     * Attach a map of id - audio data, call after `compile()` before `createNode()`
+     * 
+     * @param soundfileMap a map of id - `AudioData` as an object where `AudioData` contains channel data as `audioBuffer: Float32Array[]` and `sampleRate: number`
+     */
+    addSoundfiles(soundfileMap: Record<string, AudioData>): void;
+
+    /**
+     * Get a list of soundfiles needed, call after `compile()`
+     */
+    getSoundfileList(): string[];
+}
+
+export interface IFaustMonoDspGenerator extends GeneratorSupportingSoundfiles {
     /**
      * Compile a monophonic DSP factory from given code.
      * 
@@ -25,6 +40,7 @@ export interface IFaustMonoDspGenerator {
         meta?: FaustDspMeta;
     } | null>;
 
+
     /**
      * Create a monophonic WebAudio node (either ScriptProcessorNode or AudioWorkletNode).
      *
@@ -73,7 +89,11 @@ export interface IFaustMonoDspGenerator {
      * @param factory - default is the compiled factory
      * @returns the compiled processor or 'null' if failure
      */
-    createOfflineProcessor(sampleRate: number, bufferSize: number, factory?: LooseFaustDspFactory, meta?: FaustDspMeta): Promise<IFaustMonoOfflineProcessor | null>;
+    createOfflineProcessor(
+        sampleRate: number,
+        bufferSize: number,
+        factory?: LooseFaustDspFactory
+    ): Promise<IFaustMonoOfflineProcessor | null>;
 
     /**
      * Get DSP JSON description with its UI and metadata as object.
@@ -97,7 +117,7 @@ export interface IFaustMonoDspGenerator {
     getUI(): FaustUIDescriptor;
 }
 
-export interface IFaustPolyDspGenerator {
+export interface IFaustPolyDspGenerator extends GeneratorSupportingSoundfiles {
     /**
      * Compile a monophonic DSP factory from given code.
      * 
@@ -134,7 +154,8 @@ export interface IFaustPolyDspGenerator {
         mixerModule?: WebAssembly.Module,
         effectFactory?: LooseFaustDspFactory | null,
         sp?: boolean,
-        bufferSize?: number
+        bufferSize?: number,
+        processorName?: string
     ): Promise<IFaustPolyWebAudioNode | null>;
 
     /**
@@ -153,7 +174,8 @@ export interface IFaustPolyDspGenerator {
         voices: number,
         voiceFactory?: LooseFaustDspFactory,
         mixerModule?: WebAssembly.Module,
-        effectFactory?: LooseFaustDspFactory | null
+        effectFactory?: LooseFaustDspFactory | null,
+        processorName?: string
     ): Promise<IFaustPolyOfflineProcessor | null>;
 
     /**
@@ -198,6 +220,19 @@ export class FaustMonoDspGenerator implements IFaustMonoDspGenerator {
         }
     }
 
+    addSoundfiles(soundfileMap: Record<string, AudioData>) {
+        if (!this.factory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
+        for (const id in soundfileMap) {
+            this.factory.soundfiles[id] = soundfileMap[id];
+        }
+    }
+    getSoundfileList() {
+        if (!this.factory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
+        const meta = JSON.parse(this.factory.json);
+        const map = SoundfileReader.findSoundfilesFromMeta(meta);
+        return Object.keys(map);
+    }
+
     async createNode<SP extends boolean = false>(
         context: BaseAudioContext,
         name = this.name,
@@ -210,11 +245,10 @@ export class FaustMonoDspGenerator implements IFaustMonoDspGenerator {
 
         const meta = JSON.parse(factory.json);
         const sampleSize = meta.compile_options.match("-double") ? 8 : 4;
+        factory.soundfiles = await SoundfileReader.loadSoundfiles(meta, factory.soundfiles || {}, context);
         if (sp) {
             const instance = await FaustWasmInstantiator.createAsyncMonoDSPInstance(factory);
-            const monoDsp = new FaustMonoWebAudioDsp(instance, context.sampleRate, sampleSize, bufferSize);
-            // Initialize the DSP instance, possibly loading soundfiles
-            await monoDsp.init(context);
+            const monoDsp = new FaustMonoWebAudioDsp(instance, context.sampleRate, sampleSize, bufferSize, factory.soundfiles);
             const sp = context.createScriptProcessor(bufferSize, monoDsp.getNumInputs(), monoDsp.getNumOutputs()) as FaustMonoScriptProcessorNode;
             Object.setPrototypeOf(sp, FaustMonoScriptProcessorNode.prototype);
             sp.init(monoDsp);
@@ -233,15 +267,23 @@ const faustData = ${JSON.stringify({
                         poly: false
                     } as FaustData)};
 // Implementation needed classes of functions
-const ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
-const ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
-const ${FaustMonoWebAudioDsp.name} = ${FaustMonoWebAudioDsp.toString()}
-const ${FaustWasmInstantiator.name} = ${FaustWasmInstantiator.toString()}
+var ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
+var FaustDspInstance = ${FaustDspInstance.name};
+var ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
+var FaustBaseWebAudioDsp = ${FaustBaseWebAudioDsp.name};
+var ${FaustMonoWebAudioDsp.name} = ${FaustMonoWebAudioDsp.toString()}
+var FaustMonoWebAudioDsp = ${FaustMonoWebAudioDsp.name};
+var ${FaustWasmInstantiator.name} = ${FaustWasmInstantiator.toString()}
+var FaustWasmInstantiator = ${FaustWasmInstantiator.name};
+var ${Soundfile.name} = ${Soundfile.toString()}
+var Soundfile = ${Soundfile.name};
+var ${WasmAllocator.name} = ${WasmAllocator.toString()}
+var WasmAllocator = ${WasmAllocator.name};
 // Put them in dependencies
 const dependencies = {
-    FaustBaseWebAudioDsp: ${FaustBaseWebAudioDsp.name},
-    FaustMonoWebAudioDsp: ${FaustMonoWebAudioDsp.name},
-    FaustWasmInstantiator: ${FaustWasmInstantiator.name}
+    FaustBaseWebAudioDsp,
+    FaustMonoWebAudioDsp,
+    FaustWasmInstantiator
 };
 // Generate the actual AudioWorkletProcessor code
 (${getFaustAudioWorkletProcessor.toString()})(dependencies, faustData);
@@ -274,6 +316,7 @@ const dependencies = {
 
         const meta: FaustDspMeta = JSON.parse(factory.json);
         const sampleSize = meta.compile_options.match("-double") ? 8 : 4;
+        factory.soundfiles = await SoundfileReader.loadSoundfiles(meta, factory.soundfiles || {}, context);
         // Dynamically create AudioWorkletProcessor if code not yet created
         if (!FaustMonoDspGenerator.gWorkletProcessors.has(context)) FaustMonoDspGenerator.gWorkletProcessors.set(context, new Set());
         if (!FaustMonoDspGenerator.gWorkletProcessors.get(context)?.has(processorName)) {
@@ -287,16 +330,24 @@ const faustData = ${JSON.stringify({
                     fftOptions
                 } as FaustFFTData)};
 // Implementation needed classes of functions
-const ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
-const ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
-const ${FaustMonoWebAudioDsp.name} = ${FaustMonoWebAudioDsp.toString()}
-const ${FaustWasmInstantiator.name} = ${FaustWasmInstantiator.toString()}
-const FFTUtils = ${fftUtils.toString()}
+var ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
+var FaustDspInstance = ${FaustDspInstance.name};
+var ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
+var FaustBaseWebAudioDsp = ${FaustBaseWebAudioDsp.name};
+var ${FaustMonoWebAudioDsp.name} = ${FaustMonoWebAudioDsp.toString()}
+var FaustMonoWebAudioDsp = ${FaustMonoWebAudioDsp.name};
+var ${FaustWasmInstantiator.name} = ${FaustWasmInstantiator.toString()}
+var FaustWasmInstantiator = ${FaustWasmInstantiator.name};
+var ${Soundfile.name} = ${Soundfile.toString()}
+var Soundfile = ${Soundfile.name};
+var ${WasmAllocator.name} = ${WasmAllocator.toString()}
+var WasmAllocator = ${WasmAllocator.name};
+var FFTUtils = ${fftUtils.toString()}
 // Put them in dependencies
 const dependencies = {
-    FaustBaseWebAudioDsp: ${FaustBaseWebAudioDsp.name},
-    FaustMonoWebAudioDsp: ${FaustMonoWebAudioDsp.name},
-    FaustWasmInstantiator: ${FaustWasmInstantiator.name},
+    FaustBaseWebAudioDsp,
+    FaustMonoWebAudioDsp,
+    FaustWasmInstantiator,
     FFTUtils
 };
 // Generate the actual AudioWorkletProcessor code
@@ -371,16 +422,14 @@ const dependencies = {
     async createOfflineProcessor(
         sampleRate: number,
         bufferSize: number,
-        factory = this.factory as LooseFaustDspFactory,
+        factory = this.factory as LooseFaustDspFactory
     ) {
         if (!factory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
 
         const meta = JSON.parse(factory.json);
         const instance = await FaustWasmInstantiator.createAsyncMonoDSPInstance(factory);
         const sampleSize = meta.compile_options.match("-double") ? 8 : 4;
-        const monoDsp = new FaustMonoWebAudioDsp(instance, sampleRate, sampleSize, bufferSize);
-        // Initialize the DSP instance, no soundfiles loading for now (TODO ?)
-        await monoDsp.init(null);
+        const monoDsp = new FaustMonoWebAudioDsp(instance, sampleRate, sampleSize, bufferSize, factory.soundfiles);
         return new FaustMonoOfflineProcessor(monoDsp, bufferSize);
     }
 
@@ -421,43 +470,45 @@ export class FaustPolyDspGenerator implements IFaustPolyDspGenerator {
             // the voice and effect are adapted, possibly clearing buffers
             if (this.effectFactory) {
                 const effectJSON = JSON.parse(this.effectFactory.json);
-                const dspCode = `
-                    // Voice output is forced to 2, when DSP is stereo or effect has 2 ins or 2 outs,
-                    // so that the effect can process the 2 channels of the voice
-                    adaptOut(1,1,1) = _;
-                    adaptOut(1,1,2) = _ <: _,0;  // The left channel only is kept
-                    adaptOut(1,2,1) = _ <: _,_;
-                    adaptOut(1,2,2) = _ <: _,_;
-                    adaptOut(2,1,1) = _,_;
-                    adaptOut(2,1,2) = _,_;
-                    adaptOut(2,2,1) = _,_;
-                    adaptOut(2,2,2) = _,_;
-                    adaptor(F) = adaptOut(outputs(F),${effectJSON.inputs},${effectJSON.outputs});
-                    dsp_code = environment{
-                        ${dspCodeAux}
-                    };
-                    process = dsp_code.process : adaptor(dsp_code.process);`
-                const effectCode = `
-                    // Inputs
-                    adaptIn(1,1,1) = _;
-                    adaptIn(1,1,2) = _,_ :> _;  
-                    adaptIn(1,2,1) = _,_;
-                    adaptIn(1,2,2) = _,_;
-                    adaptIn(2,1,1) = _,_ :> _;
-                    adaptIn(2,1,2) = _,_ :> _;
-                    adaptIn(2,2,1) = _,_;
-                    adaptIn(2,2,2) = _,_;
-                    // Outputs
-                    adaptOut(1,1) = _ <: _,0;   // The left channel only is kept
-                    adaptOut(1,2) = _,_;
-                    adaptOut(2,1) = _ <: _,0;   // The left channel only is kept
-                    adaptOut(2,2) = _,_;
-                    adaptorIns(F) = adaptIn(outputs(F),${effectJSON.inputs},${effectJSON.outputs});
-                    adaptorOuts = adaptOut(${effectJSON.inputs},${effectJSON.outputs});
-                    dsp_code = environment{
-                        ${dspCodeAux}
-                    };
-                    process = adaptorIns(dsp_code.process) : dsp_code.effect : adaptorOuts;`
+                const dspCode = `\
+// Voice output is forced to 2, when DSP is stereo or effect has 2 ins or 2 outs,
+// so that the effect can process the 2 channels of the voice
+adaptOut(1,1,1) = _;
+adaptOut(1,1,2) = _ <: _,0;  // The left channel only is kept
+adaptOut(1,2,1) = _ <: _,_;
+adaptOut(1,2,2) = _ <: _,_;
+adaptOut(2,1,1) = _,_;
+adaptOut(2,1,2) = _,_;
+adaptOut(2,2,1) = _,_;
+adaptOut(2,2,2) = _,_;
+adaptor(F) = adaptOut(outputs(F),${effectJSON.inputs},${effectJSON.outputs});
+dsp_code = environment{
+    ${dspCodeAux}
+};
+process = dsp_code.process : adaptor(dsp_code.process);
+`;
+                const effectCode = `\
+// Inputs
+adaptIn(1,1,1) = _;
+adaptIn(1,1,2) = _,_ :> _;  
+adaptIn(1,2,1) = _,_;
+adaptIn(1,2,2) = _,_;
+adaptIn(2,1,1) = _,_ :> _;
+adaptIn(2,1,2) = _,_ :> _;
+adaptIn(2,2,1) = _,_;
+adaptIn(2,2,2) = _,_;
+// Outputs
+adaptOut(1,1) = _ <: _,0;   // The left channel only is kept
+adaptOut(1,2) = _,_;
+adaptOut(2,1) = _ <: _,0;   // The left channel only is kept
+adaptOut(2,2) = _,_;
+adaptorIns(F) = adaptIn(outputs(F),${effectJSON.inputs},${effectJSON.outputs});
+adaptorOuts = adaptOut(${effectJSON.inputs},${effectJSON.outputs});
+dsp_code = environment{
+    ${dspCodeAux}
+};
+process = adaptorIns(dsp_code.process) : dsp_code.effect : adaptorOuts;
+`;
                 this.voiceFactory = await compiler.createPolyDSPFactory(name, dspCode, args);
                 try {
                     // Effect is processing same buffers for inputs and outputs, so has to use -inpl option
@@ -484,6 +535,22 @@ export class FaustPolyDspGenerator implements IFaustPolyDspGenerator {
         }
     }
 
+    addSoundfiles(soundfileMap: Record<string, AudioData>) {
+        if (!this.voiceFactory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
+        for (const id in soundfileMap) {
+            this.voiceFactory.soundfiles[id] = soundfileMap[id];
+        }
+    }
+    getSoundfileList() {
+        if (!this.voiceFactory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
+        const meta = JSON.parse(this.voiceFactory.json);
+        const map = SoundfileReader.findSoundfilesFromMeta(meta);
+        if (!this.effectFactory) return Object.keys(map);
+        const effectMeta = JSON.parse(this.effectFactory.json);
+        const effectMap = SoundfileReader.findSoundfilesFromMeta(effectMeta);
+        return Object.keys({ ...effectMap, ...map });
+    }
+
     async createNode<SP extends boolean = false>(
         context: BaseAudioContext,
         voices: number,
@@ -500,11 +567,12 @@ export class FaustPolyDspGenerator implements IFaustPolyDspGenerator {
         const voiceMeta = JSON.parse(voiceFactory.json);
         const effectMeta = effectFactory ? JSON.parse(effectFactory.json) : undefined;
         const sampleSize = voiceMeta.compile_options.match("-double") ? 8 : 4;
+        voiceFactory.soundfiles = await SoundfileReader.loadSoundfiles(voiceMeta, voiceFactory.soundfiles || {}, context);
+        if (effectFactory) effectFactory.soundfiles = await SoundfileReader.loadSoundfiles(effectMeta, effectFactory.soundfiles || {}, context);
         if (sp) {
             const instance = await FaustWasmInstantiator.createAsyncPolyDSPInstance(voiceFactory, mixerModule, voices, effectFactory || undefined);
-            const polyDsp = new FaustPolyWebAudioDsp(instance, context.sampleRate, sampleSize, bufferSize);
-            // Initialize the DSP instance, possibly loading soundfiles
-            await polyDsp.init(context);
+            const soundfiles = { ...effectFactory?.soundfiles, ...voiceFactory.soundfiles };
+            const polyDsp = new FaustPolyWebAudioDsp(instance, context.sampleRate, sampleSize, bufferSize, soundfiles);
             const sp = context.createScriptProcessor(bufferSize, polyDsp.getNumInputs(), polyDsp.getNumOutputs()) as FaustPolyScriptProcessorNode;
             Object.setPrototypeOf(sp, FaustPolyScriptProcessorNode.prototype);
             sp.init(polyDsp);
@@ -524,16 +592,25 @@ const faustData = ${JSON.stringify({
                         effectMeta
                     } as FaustData)};
 // Implementation needed classes of functions
-const ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
-const ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
-const ${FaustPolyWebAudioDsp.name} = ${FaustPolyWebAudioDsp.toString()}
-const ${FaustWebAudioDspVoice.name} = ${FaustWebAudioDspVoice.toString()}
-const ${FaustWasmInstantiator.name} = ${FaustWasmInstantiator.toString()}
+var ${FaustDspInstance.name} = ${FaustDspInstance.toString()}
+var FaustDspInstance = ${FaustDspInstance.name};
+var ${FaustBaseWebAudioDsp.name} = ${FaustBaseWebAudioDsp.toString()}
+var FaustBaseWebAudioDsp = ${FaustBaseWebAudioDsp.name};
+var ${FaustPolyWebAudioDsp.name} = ${FaustPolyWebAudioDsp.toString()}
+var FaustPolyWebAudioDsp = ${FaustPolyWebAudioDsp.name};
+var ${FaustWebAudioDspVoice.name} = ${FaustWebAudioDspVoice.toString()}
+var FaustWebAudioDspVoice = ${FaustWebAudioDspVoice.name};
+var ${FaustWasmInstantiator.name} = ${FaustWasmInstantiator.toString()}
+var FaustWasmInstantiator = ${FaustWasmInstantiator.name};
+var ${Soundfile.name} = ${Soundfile.toString()}
+var Soundfile = ${Soundfile.name};
+var ${WasmAllocator.name} = ${WasmAllocator.toString()}
+var WasmAllocator = ${WasmAllocator.name};
 // Put them in dependencies
 const dependencies = {
-    FaustBaseWebAudioDsp: ${FaustBaseWebAudioDsp.name},
-    FaustPolyWebAudioDsp: ${FaustPolyWebAudioDsp.name},
-    FaustWasmInstantiator: ${FaustWasmInstantiator.name}
+    FaustBaseWebAudioDsp,
+    FaustPolyWebAudioDsp,
+    FaustWasmInstantiator
 };
 // Generate the actual AudioWorkletProcessor code
 (${getFaustAudioWorkletProcessor.toString()})(dependencies, faustData);
@@ -606,7 +683,8 @@ const dependencies = {
         const effectMeta = effectFactory ? JSON.parse(effectFactory.json) : undefined;
         const instance = await FaustWasmInstantiator.createAsyncPolyDSPInstance(voiceFactory, mixerModule, voices, effectFactory || undefined);
         const sampleSize = voiceMeta.compile_options.match("-double") ? 8 : 4;
-        const polyDsp = new FaustPolyWebAudioDsp(instance, sampleRate, sampleSize, bufferSize);
+        const soundfiles = { ...effectFactory?.soundfiles, ...voiceFactory.soundfiles };
+        const polyDsp = new FaustPolyWebAudioDsp(instance, sampleRate, sampleSize, bufferSize, soundfiles);
         return new FaustPolyOfflineProcessor(polyDsp, bufferSize);
     }
 

package/src/FaustDspInstance.ts

@@ -31,7 +31,7 @@ export interface IFaustDspInstance {
      * 
      * @param $dsp - the DSP pointer
      * @param index - the parameter index
-     * @preturn the parameter value
+     * @return the parameter value
      */
     getParamValue($dsp: number, index: number): number;
 
@@ -39,7 +39,7 @@ export interface IFaustDspInstance {
      * Give the Faust wasm instance sample rate.
      * 
      * @param $dsp - the DSP pointer
-     * @preturn the sample rate
+     * @return the sample rate
      */
     getSampleRate($dsp: number): number;
 

package/src/FaustFFTAudioWorkletProcessor.ts

@@ -162,6 +162,7 @@ const getFaustFFTAudioWorkletProcessor = (dependencies: FaustFFTAudioWorkletProc
         private fPlotHandler: PlotHandler | null = null;
         private fCachedEvents: { type: string; data: any }[] = [];
         private fBufferNum = 0;
+        private soundfiles: LooseFaustDspFactory["soundfiles"] = {};
         get fftProcessorBufferSize() {
             return this.fftSize / 2 + 1;
         }
@@ -182,6 +183,7 @@ const getFaustFFTAudioWorkletProcessor = (dependencies: FaustFFTAudioWorkletProc
 
             this.dspInstance = FaustWasmInstantiator.createSyncMonoDSPInstance(factory);
             this.sampleSize = sampleSize;
+            this.soundfiles = factory.soundfiles;
 
             // Init the FFT constructor and the Faust FFT Processor
             this.initFFT();
@@ -509,7 +511,7 @@ const getFaustFFTAudioWorkletProcessor = (dependencies: FaustFFTAudioWorkletProc
             this.fDSPCode?.destroy();
 
             // Create Monophonic DSP
-            this.fDSPCode = new FaustMonoWebAudioDsp(this.dspInstance, sampleRate, this.sampleSize, this.fftProcessorBufferSize);
+            this.fDSPCode = new FaustMonoWebAudioDsp(this.dspInstance, sampleRate, this.sampleSize, this.fftProcessorBufferSize, this.soundfiles);
 
             // Setup output handler
             this.fDSPCode.setOutputParamHandler((path, value) => this.port.postMessage({ path, value, type: "param" }));