@grame/faustwasm 0.4.4 → 0.4.6

package/dist/cjs/index.d.ts

@@ -887,6 +887,8 @@ export interface FaustPolyAudioWorkletNodeOptions extends AudioWorkletNodeOption
 export interface FaustAudioWorkletProcessorOptions {
 	name: string;
 	sampleSize: number;
+	moduleId?: string;
+	instanceId?: string;
 }
 export interface FaustMonoAudioWorkletProcessorOptions extends FaustAudioWorkletProcessorOptions {
 	factory: LooseFaustDspFactory;
@@ -931,6 +933,8 @@ export interface FaustFFTAudioWorkletProcessorOptions {
 	name: string;
 	sampleSize: number;
 	factory: LooseFaustDspFactory;
+	moduleId?: string;
+	instanceId?: string;
 }
 export declare const getFaustFFTAudioWorkletProcessor: (dependencies: FaustFFTAudioWorkletProcessorDependencies, faustData: FaustFFTData, register?: boolean) => {
 	new (options: AudioWorkletNodeOptions): AudioWorkletProcessor;
@@ -1266,7 +1270,7 @@ export declare class SoundfileReader {
 	static loadSoundfiles(dspMeta: FaustDspMeta, soundfilesIn: LooseFaustDspFactory["soundfiles"], audioCtx: BaseAudioContext): Promise<LooseFaustDspFactory["soundfiles"]>;
 }
 declare const FaustAudioWorkletNode_base: {
-	new (context: BaseAudioContext, name: string, options?: AudioWorkletNodeOptions | undefined): AudioWorkletNode;
+	new (context: BaseAudioContext, name: string, options?: AudioWorkletNodeOptions): AudioWorkletNode;
 	prototype: AudioWorkletNode;
 };
 /**
@@ -1282,7 +1286,7 @@ export declare class FaustAudioWorkletNode<Poly extends boolean = false> extends
 	protected fPlotHandler: PlotHandler | null;
 	protected fUICallback: UIHandler;
 	protected fDescriptor: FaustUIInputItem[];
-	constructor(context: BaseAudioContext, name: string, factory: LooseFaustDspFactory, options: FaustAudioWorkletNodeOptions<Poly>["processorOptions"], nodeOptions?: Partial<FaustAudioWorkletNodeOptions>);
+	constructor(context: BaseAudioContext, name: string, factory: LooseFaustDspFactory, options?: Partial<FaustAudioWorkletNodeOptions<Poly>>);
 	/** Setup accelerometer and gyroscope handlers */
 	listenSensors(): Promise<void>;
 	setOutputParamHandler(handler: OutputParamHandler | null): void;
@@ -1291,6 +1295,7 @@ export declare class FaustAudioWorkletNode<Poly extends boolean = false> extends
 	getComputeHandler(): ComputeHandler | null;
 	setPlotHandler(handler: PlotHandler | null): void;
 	getPlotHandler(): PlotHandler | null;
+	setupWamEventHandler(): void;
 	getNumInputs(): number;
 	getNumOutputs(): number;
 	compute(inputs: Float32Array[], outputs: Float32Array[]): boolean;
@@ -1318,7 +1323,7 @@ export declare class FaustAudioWorkletNode<Poly extends boolean = false> extends
  */
 export declare class FaustMonoAudioWorkletNode extends FaustAudioWorkletNode<false> implements IFaustMonoWebAudioDsp {
 	onprocessorerror: (e: Event) => never;
-	constructor(context: BaseAudioContext, name: string, factory: LooseFaustDspFactory, sampleSize: number, nodeOptions?: Partial<FaustAudioWorkletNodeOptions>);
+	constructor(context: BaseAudioContext, options: Partial<FaustAudioWorkletNodeOptions<false>> & Pick<FaustAudioWorkletNodeOptions<false>, "processorOptions">);
 }
 /**
  * Polyphonic AudioWorkletNode
@@ -1326,7 +1331,7 @@ export declare class FaustMonoAudioWorkletNode extends FaustAudioWorkletNode<fal
 export declare class FaustPolyAudioWorkletNode extends FaustAudioWorkletNode<true> implements IFaustPolyWebAudioDsp {
 	private fJSONEffect;
 	onprocessorerror: (e: Event) => never;
-	constructor(context: BaseAudioContext, name: string, voiceFactory: LooseFaustDspFactory, mixerModule: WebAssembly.Module, voices: number, sampleSize: number, effectFactory?: LooseFaustDspFactory, nodeOptions?: Partial<FaustAudioWorkletNodeOptions>);
+	constructor(context: BaseAudioContext, options: Partial<FaustAudioWorkletNodeOptions<true>> & Pick<FaustAudioWorkletNodeOptions<true>, "processorOptions">);
 	keyOn(channel: number, pitch: number, velocity: number): void;
 	keyOff(channel: number, pitch: number, velocity: number): void;
 	allNotesOff(hard: boolean): void;
@@ -1419,9 +1424,10 @@ export interface IFaustMonoDspGenerator extends GeneratorSupportingSoundfiles {
 	 * @param sp - whether to compile a ScriptProcessorNode or an AudioWorkletNode
 	 * @param bufferSize - the buffer size in frames to be used in ScriptProcessorNode only, since AudioWorkletNode always uses 128 frames
 	 * @param processorName - AudioWorklet Processor name
+	 * @param processorOptions - Additional AudioWorklet Processor options
 	 * @returns the compiled WebAudio node or 'null' if failure
 	 */
-	createNode(context: BaseAudioContext, name?: string, factory?: LooseFaustDspFactory, sp?: boolean, bufferSize?: number, processorName?: string): Promise<IFaustMonoWebAudioNode | null>;
+	createNode(context: BaseAudioContext, name?: string, factory?: LooseFaustDspFactory, sp?: boolean, bufferSize?: number, processorName?: string, processorOptions?: Record<string, any>): Promise<IFaustMonoWebAudioNode | null>;
 	/**
 	 * Create a monophonic WebAudio node (either ScriptProcessorNode or AudioWorkletNode).
 	 *
@@ -1431,9 +1437,10 @@ export interface IFaustMonoDspGenerator extends GeneratorSupportingSoundfiles {
 	 * @param factory - default is the compiled factory
 	 * @param fftOptions - initial FFT options
 	 * @param processorName - AudioWorklet Processor name
+	 * @param processorOptions - Additional AudioWorklet Processor options
 	 * @returns the compiled WebAudio node or 'null' if failure
 	 */
-	createFFTNode(context: BaseAudioContext, fftUtils: typeof FFTUtils, name?: string, factory?: LooseFaustDspFactory, fftOptions?: Partial<FaustFFTOptionsData>, processorName?: string): Promise<FaustMonoAudioWorkletNode | null>;
+	createFFTNode(context: BaseAudioContext, fftUtils: typeof FFTUtils, name?: string, factory?: LooseFaustDspFactory, fftOptions?: Partial<FaustFFTOptionsData>, processorName?: string, processorOptions?: Record<string, any>): Promise<FaustMonoAudioWorkletNode | null>;
 	/**
 	 * Create a monophonic Offline processor.
 	 *
@@ -1489,9 +1496,10 @@ export interface IFaustPolyDspGenerator extends GeneratorSupportingSoundfiles {
 	 * @param effectFactory - the Faust factory for the effect, either obtained with a compiler (createDSPFactory) or loaded from files (loadDSPFactory)
 	 * @param sp - whether to compile a ScriptProcessorNode or an AudioWorkletNode
 	 * @param bufferSize - the buffer size in frames to be used in ScriptProcessorNode only, since AudioWorkletNode always uses 128 frames
+	 * @param processorOptions - Additional AudioWorklet Processor options
 	 * @returns the compiled WebAudio node or 'null' if failure
 	 */
-	createNode(context: BaseAudioContext, voices: number, name?: string, voiceFactory?: LooseFaustDspFactory, mixerModule?: WebAssembly.Module, effectFactory?: LooseFaustDspFactory | null, sp?: boolean, bufferSize?: number, processorName?: string): Promise<IFaustPolyWebAudioNode | null>;
+	createNode(context: BaseAudioContext, voices: number, name?: string, voiceFactory?: LooseFaustDspFactory, mixerModule?: WebAssembly.Module, effectFactory?: LooseFaustDspFactory | null, sp?: boolean, bufferSize?: number, processorName?: string, processorOptions?: Record<string, any>): Promise<IFaustPolyWebAudioNode | null>;
 	/**
 	 * Create a monophonic Offline processor.
 	 *
@@ -1531,8 +1539,8 @@ export declare class FaustMonoDspGenerator implements IFaustMonoDspGenerator {
 	compile(compiler: IFaustCompiler, name: string, code: string, args: string): Promise<this | null>;
 	addSoundfiles(soundfileMap: Record<string, AudioData>): void;
 	getSoundfileList(): string[];
-	createNode<SP extends boolean = false>(context: BaseAudioContext, name?: string, factory?: LooseFaustDspFactory, sp?: SP, bufferSize?: number, processorName?: string): Promise<SP extends true ? FaustMonoScriptProcessorNode | null : FaustMonoAudioWorkletNode | null>;
-	createFFTNode(context: BaseAudioContext, fftUtils: typeof FFTUtils, name?: string, factory?: LooseFaustDspFactory, fftOptions?: Partial<FaustFFTOptionsData>, processorName?: string): Promise<FaustMonoAudioWorkletNode | null>;
+	createNode<SP extends boolean = false>(context: BaseAudioContext, name?: string, factory?: LooseFaustDspFactory, sp?: SP, bufferSize?: number, processorName?: string, processorOptions?: Record<string, any>): Promise<SP extends true ? FaustMonoScriptProcessorNode | null : FaustMonoAudioWorkletNode | null>;
+	createFFTNode(context: BaseAudioContext, fftUtils: typeof FFTUtils, name?: string, factory?: LooseFaustDspFactory, fftOptions?: Partial<FaustFFTOptionsData>, processorName?: string, processorOptions?: Record<string, any>): Promise<FaustMonoAudioWorkletNode | null>;
 	createAudioWorkletProcessor(name?: string, factory?: LooseFaustDspFactory, processorName?: string): Promise<{
 		new (options: AudioWorkletNodeOptions): AudioWorkletProcessor;
 		prototype: AudioWorkletProcessor;
@@ -1554,7 +1562,7 @@ export declare class FaustPolyDspGenerator implements IFaustPolyDspGenerator {
 	compile(compiler: IFaustCompiler, name: string, dspCodeAux: string, args: string, effectCodeAux?: string): Promise<this | null>;
 	addSoundfiles(soundfileMap: Record<string, AudioData>): void;
 	getSoundfileList(): string[];
-	createNode<SP extends boolean = false>(context: BaseAudioContext, voices: number, name?: string, voiceFactory?: LooseFaustDspFactory, mixerModule?: WebAssembly.Module, effectFactory?: LooseFaustDspFactory | null, sp?: SP, bufferSize?: number, processorName?: string): Promise<SP extends true ? FaustPolyScriptProcessorNode | null : FaustPolyAudioWorkletNode | null>;
+	createNode<SP extends boolean = false>(context: BaseAudioContext, voices: number, name?: string, voiceFactory?: LooseFaustDspFactory, mixerModule?: WebAssembly.Module, effectFactory?: LooseFaustDspFactory | null, sp?: SP, bufferSize?: number, processorName?: string, processorOptions?: {}): Promise<SP extends true ? FaustPolyScriptProcessorNode | null : FaustPolyAudioWorkletNode | null>;
 	createAudioWorkletProcessor(name?: string, voiceFactory?: LooseFaustDspFactory, effectFactory?: LooseFaustDspFactory | null, processorName?: string): Promise<{
 		new (options: AudioWorkletNodeOptions): AudioWorkletProcessor;
 		prototype: AudioWorkletProcessor;

package/dist/cjs/index.js

@@ -141,6 +141,10 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
         parameterDescriptors.forEach((pd) => {
           this.paramValuesCache[pd.name] = pd.defaultValue || 0;
         });
+        const { moduleId, instanceId } = options.processorOptions;
+        if (!moduleId || !instanceId)
+          return;
+        this.wamInfo = { moduleId, instanceId };
       }
       static get parameterDescriptors() {
         const params = [];
@@ -154,6 +158,23 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
           FaustBaseWebAudioDsp2.parseUI(effectMeta.ui, callback);
         return params;
       }
+      setupWamEventHandler() {
+        var _a;
+        if (!this.wamInfo)
+          return;
+        const { moduleId, instanceId } = this.wamInfo;
+        const { webAudioModules } = globalThis;
+        const ModuleScope = webAudioModules.getModuleScope(moduleId);
+        const paramMgrProcessor = (_a = ModuleScope == null ? void 0 : ModuleScope.paramMgrProcessors) == null ? void 0 : _a[instanceId];
+        if (!paramMgrProcessor)
+          return;
+        if (paramMgrProcessor.handleEvent)
+          return;
+        paramMgrProcessor.handleEvent = (event) => {
+          if (event.type === "wam-midi")
+            this.midiMessage(event.data.bytes);
+        };
+      }
       process(inputs, outputs, parameters) {
         for (const path in parameters) {
           const [paramValue] = parameters[path];
@@ -199,6 +220,10 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
             }
             break;
           }
+          case "setupWamEventHandler": {
+            this.setupWamEventHandler();
+            break;
+          }
           case "start": {
             this.fDSPCode.start();
             break;
@@ -408,6 +433,10 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
         this.sampleSize = sampleSize;
         this.soundfiles = factory.soundfiles;
         this.initFFT();
+        const { moduleId, instanceId } = options.processorOptions;
+        if (!moduleId || !instanceId)
+          return;
+        this.wamInfo = { moduleId, instanceId };
       }
       get fftProcessorBufferSize() {
         return this.fftSize / 2 + 1;
@@ -453,6 +482,23 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
           }
         ];
       }
+      setupWamEventHandler() {
+        var _a;
+        if (!this.wamInfo)
+          return;
+        const { moduleId, instanceId } = this.wamInfo;
+        const { webAudioModules } = globalThis;
+        const ModuleScope = webAudioModules.getModuleScope(moduleId);
+        const paramMgrProcessor = (_a = ModuleScope == null ? void 0 : ModuleScope.paramMgrProcessors) == null ? void 0 : _a[instanceId];
+        if (!paramMgrProcessor)
+          return;
+        if (paramMgrProcessor.handleEvent)
+          return;
+        paramMgrProcessor.handleEvent = (event) => {
+          if (event.type === "wam-midi")
+            this.midiMessage(event.data.bytes);
+        };
+      }
       processFFT() {
         let samplesForFFT = mod(this.$inputWrite - this.$inputRead, this.fftBufferSize) || this.fftBufferSize;
         while (samplesForFFT >= this.fftSize) {
@@ -590,6 +636,10 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
             (_a = this.fDSPCode) == null ? void 0 : _a.setPlotHandler(this.fPlotHandler);
             break;
           }
+          case "setupWamEventHandler": {
+            this.setupWamEventHandler();
+            break;
+          }
           case "start": {
             (_b = this.fDSPCode) == null ? void 0 : _b.start();
             break;
@@ -3649,7 +3699,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
   // src/FaustAudioWorkletNode.ts
   var _hasAccInput, _hasGyrInput;
   var FaustAudioWorkletNode = class extends (globalThis.AudioWorkletNode || null) {
-    constructor(context, name, factory, options, nodeOptions = {}) {
+    constructor(context, name, factory, options = {}) {
       const JSONObj = JSON.parse(factory.json);
       super(context, name, {
         numberOfInputs: JSONObj.inputs > 0 ? 1 : 0,
@@ -3658,8 +3708,8 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
         outputChannelCount: [JSONObj.outputs],
         channelCountMode: "explicit",
         channelInterpretation: "speakers",
-        processorOptions: options,
-        ...nodeOptions
+        processorOptions: options.processorOptions,
+        ...options
       });
       __privateAdd(this, _hasAccInput, false);
       __privateAdd(this, _hasGyrInput, false);
@@ -3777,6 +3827,9 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     getPlotHandler() {
       return this.fPlotHandler;
     }
+    setupWamEventHandler() {
+      this.port.postMessage({ type: "setupWamEventHandler" });
+    }
     getNumInputs() {
       return this.fJSONDsp.inputs;
     }
@@ -3870,33 +3923,25 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
   _hasAccInput = new WeakMap();
   _hasGyrInput = new WeakMap();
   var FaustMonoAudioWorkletNode = class extends FaustAudioWorkletNode {
-    constructor(context, name, factory, sampleSize, nodeOptions = {}) {
-      super(context, name, factory, { name, factory, sampleSize }, nodeOptions);
+    constructor(context, options) {
+      super(context, options.processorOptions.name, options.processorOptions.factory, options);
       this.onprocessorerror = (e) => {
         throw e;
       };
     }
   };
   var FaustPolyAudioWorkletNode = class extends FaustAudioWorkletNode {
-    constructor(context, name, voiceFactory, mixerModule, voices, sampleSize, effectFactory, nodeOptions = {}) {
+    constructor(context, options) {
       super(
         context,
-        name,
-        voiceFactory,
-        {
-          name,
-          voiceFactory,
-          mixerModule,
-          voices,
-          sampleSize,
-          effectFactory
-        },
-        nodeOptions
+        options.processorOptions.name,
+        options.processorOptions.voiceFactory,
+        options
       );
       this.onprocessorerror = (e) => {
         throw e;
       };
-      this.fJSONEffect = effectFactory ? JSON.parse(effectFactory.json) : null;
+      this.fJSONEffect = options.processorOptions.effectFactory ? JSON.parse(options.processorOptions.effectFactory.json) : null;
       if (this.fJSONEffect) {
         FaustBaseWebAudioDsp.parseUI(this.fJSONEffect.ui, this.fUICallback);
       }
@@ -4146,7 +4191,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       const map = SoundfileReader_default.findSoundfilesFromMeta(meta);
       return Object.keys(map);
     }
-    async createNode(context, name = this.name, factory = this.factory, sp = false, bufferSize = 1024, processorName = (factory == null ? void 0 : factory.shaKey) || name) {
+    async createNode(context, name = this.name, factory = this.factory, sp = false, bufferSize = 1024, processorName = (factory == null ? void 0 : factory.shaKey) || name, processorOptions = {}) {
       var _a, _b;
       if (!factory)
         throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
@@ -4204,11 +4249,11 @@ const dependencies = {
             throw e;
           }
         }
-        const node = new FaustMonoAudioWorkletNode(context, processorName, factory, sampleSize);
+        const node = new FaustMonoAudioWorkletNode(context, { processorOptions: { name: processorName, factory, sampleSize, ...processorOptions } });
         return node;
       }
     }
-    async createFFTNode(context, fftUtils, name = this.name, factory = this.factory, fftOptions = {}, processorName = (factory == null ? void 0 : factory.shaKey) ? `${factory.shaKey}_fft` : name) {
+    async createFFTNode(context, fftUtils, name = this.name, factory = this.factory, fftOptions = {}, processorName = (factory == null ? void 0 : factory.shaKey) ? `${factory.shaKey}_fft` : name, processorOptions = {}) {
       var _a, _b;
       if (!factory)
         throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
@@ -4260,7 +4305,7 @@ const dependencies = {
           throw e;
         }
       }
-      const node = new FaustMonoAudioWorkletNode(context, processorName, factory, sampleSize, { channelCount: Math.max(1, Math.ceil(meta.inputs / 3)), outputChannelCount: [Math.ceil(meta.outputs / 2)] });
+      const node = new FaustMonoAudioWorkletNode(context, { channelCount: Math.max(1, Math.ceil(meta.inputs / 3)), outputChannelCount: [Math.ceil(meta.outputs / 2)], processorOptions: { name: processorName, factory, sampleSize, ...processorOptions } });
       if (fftOptions.fftSize) {
         const param = node.parameters.get("fftSize");
         if (param)
@@ -4422,7 +4467,7 @@ process = adaptorIns(dsp_code.process) : dsp_code.effect : adaptorOuts;
       const effectMap = SoundfileReader_default.findSoundfilesFromMeta(effectMeta);
       return Object.keys({ ...effectMap, ...map });
     }
-    async createNode(context, voices, name = this.name, voiceFactory = this.voiceFactory, mixerModule = this.mixerModule, effectFactory = this.effectFactory, sp = false, bufferSize = 1024, processorName = ((voiceFactory == null ? void 0 : voiceFactory.shaKey) || "") + ((effectFactory == null ? void 0 : effectFactory.shaKey) || "") || `${name}_poly`) {
+    async createNode(context, voices, name = this.name, voiceFactory = this.voiceFactory, mixerModule = this.mixerModule, effectFactory = this.effectFactory, sp = false, bufferSize = 1024, processorName = ((voiceFactory == null ? void 0 : voiceFactory.shaKey) || "") + ((effectFactory == null ? void 0 : effectFactory.shaKey) || "") || `${name}_poly`, processorOptions = {}) {
       var _a, _b;
       if (!voiceFactory)
         throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
@@ -4487,7 +4532,7 @@ const dependencies = {
             throw e;
           }
         }
-        const node = new FaustPolyAudioWorkletNode(context, processorName, voiceFactory, mixerModule, voices, sampleSize, effectFactory || void 0);
+        const node = new FaustPolyAudioWorkletNode(context, { processorOptions: { name: processorName, voiceFactory, mixerModule, voices, sampleSize, effectFactory: effectFactory || void 0, ...processorOptions } });
         return node;
       }
     }