@grame/faustwasm 0.4.5 → 0.4.8

package/fileutils.js

@@ -15,7 +15,10 @@ const __filename = fileURLToPath(import.meta.url);
  * @param {string} dest - The destination path.
  */
 const cpSync = (src, dest) => {
-    if (!fs.existsSync(src)) return;
+    if (!fs.existsSync(src)) {
+        console.error(`${src} does not exist.`)
+        return;
+    }
     if (fs.lstatSync(src).isDirectory()) {
         if (!fs.existsSync(dest)) fs.mkdirSync(dest);
         fs.readdirSync(src).forEach(child => cpSync(path.join(src, child), path.join(dest, child)));
@@ -27,29 +30,24 @@ const cpSync = (src, dest) => {
 /**
  * @param {string} src - The source path of the file to modify and copy.
  * @param {string} dest - The destination path.
- * @param {string} find - The string to find.
- * @param {string} replace - The string to replace.
+ * @param {string[]} findAndReplace - The string to find and to replace pairs.
  */
-const cpSyncModify = (src, dest, find, replace) => {
-    fs.readFile(src, 'utf8', function (err, data) {
-        if (err) {
-            console.error(err);
-            return;
-        }
-
+const cpSyncModify = (src, dest, ...findAndReplace) => {
+    if (!fs.existsSync(src)) {
+        console.error(`${src} does not exist.`)
+        return;
+    }
+    let data = fs.readFileSync(src, "utf-8");
+    for (let i = 0; i < findAndReplace.length; i += 2) {
+        const find = findAndReplace[i];
+        const replace = findAndReplace[i + 1];
         // Create a regular expression from the 'find' string
-        const regex = new RegExp(find, 'g');
-
+        const regex = new RegExp(find, "g");
         // Replace 'find' with 'replace'
-        let modifiedData = data.replace(regex, replace);
-
-        // Write the modified data to a new file
-        fs.writeFile(dest, modifiedData, 'utf8', function (err) {
-            if (err) {
-                console.error(err);
-            }
-        });
-    });
+        data = data.replace(regex, replace);
+    }
+    // Write the modified data to a new file
+    fs.writeFileSync(dest, data, "utf-8");
 }
 /**
  * @param {string} dir - The directory to remove.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grame/faustwasm",
-  "version": "0.4.5",
+  "version": "0.4.8",
   "description": "WebAssembly version of Faust Compiler",
   "main": "dist/cjs/index.js",
   "types": "dist/esm/index.d.ts",
@@ -39,9 +39,11 @@
   "homepage": "https://github.com/grame-cncm/faustwasm#readme",
   "devDependencies": {
     "@aws-crypto/sha256-js": "^5.2.0",
-    "@shren/faust-ui": "^1.1.11",
+    "@shren/faust-ui": "^1.1.12",
     "@types/node": "^20.12.7",
     "@types/webmidi": "^2.0.10",
+    "@webaudiomodules/api": "^2.0.0-alpha.6",
+    "@webaudiomodules/sdk-parammgr": "^0.0.13",
     "dts-bundle-generator": "^9.5.1",
     "esbuild": "^0.20.2",
     "typescript": "^5.4.5"

package/scripts/faust2wasm.js

@@ -8,7 +8,7 @@ const argv = process.argv.slice(2);
 
 if (argv[0] === "-help" || argv[0] === "-h") {
     console.log(`
-faust2wasm.js <file.dsp> <outputDir> [-poly] [-standalone]
+faust2wasm.js <file.dsp> <outputDir> [-poly] [-standalone] [-no-template]
 Generates WebAssembly and metadata JSON files of a given Faust DSP.
 `);
     process.exit();
@@ -22,15 +22,20 @@ const $standalone = argv.indexOf("-standalone");
 const standalone = $standalone !== -1;
 if (standalone) argv.splice($standalone, 1);
 
+const $noTemplate = argv.indexOf("-no-template");
+const noTemplate = $noTemplate !== -1;
+if (noTemplate) argv.splice($noTemplate, 1);
+
 const [inputFile, outputDir, ...argvFaust] = argv;
 const fileName = inputFile.split('/').pop();
+if (!fileName) throw new Error("No input DSP file");
 const dspName = fileName.replace(/\.dsp$/, '');
 
 (async () => {
-    await faust2wasmFiles(inputFile, outputDir, argvFaust, poly);
+    const { dspMeta, effectMeta } = await faust2wasmFiles(inputFile, outputDir, argvFaust, poly);
     if (standalone) {
-        copyWebStandaloneAssets(outputDir, dspName, poly);
-    } else {
-        copyWebTemplateAssets(outputDir, dspName, poly);
+        copyWebStandaloneAssets(outputDir, dspName, poly, !!effectMeta);
+    } else if (!noTemplate) {
+        copyWebTemplateAssets(outputDir, dspName, poly, !!effectMeta);
     }
 })();

package/src/FaustAudioWorkletNode.ts

@@ -18,7 +18,7 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
     #hasAccInput = false;
     #hasGyrInput = false;
 
-    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>> = {}) {
 
         // Create JSON object
         const JSONObj: FaustDspMeta = JSON.parse(factory.json);
@@ -31,8 +31,8 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
             outputChannelCount: [JSONObj.outputs],
             channelCountMode: "explicit",
             channelInterpretation: "speakers",
-            processorOptions: options,
-            ...nodeOptions
+            processorOptions: options.processorOptions,
+            ...options
         });
 
         this.fJSONDsp = JSONObj;
@@ -76,20 +76,11 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
     async listenSensors() {
         if (this.hasAccInput) {
             const isAndroid: boolean = /Android/i.test(navigator.userAgent);
-            let handleDeviceMotion = null;
-            if (isAndroid) {
-                handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
-                    if (!accelerationIncludingGravity) return;
-                    const { x, y, z } = accelerationIncludingGravity;
-                    this.propagateAcc({ x, y, z }, true);
-                }
-            } else {
-                handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
-                    if (!accelerationIncludingGravity) return;
-                    const { x, y, z } = accelerationIncludingGravity;
-                    this.propagateAcc({ x, y, z });
-                }
-            }
+            const handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
+                if (!accelerationIncludingGravity) return;
+                const { x, y, z } = accelerationIncludingGravity;
+                this.propagateAcc({ x, y, z }, isAndroid);
+            };
             if (window.DeviceMotionEvent) {
                 if (typeof (window.DeviceMotionEvent as any).requestPermission === "function") { // for iOS 13+
                     try {
@@ -156,6 +147,9 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
     getPlotHandler(): PlotHandler | null {
         return this.fPlotHandler;
     }
+    setupWamEventHandler() {
+        this.port.postMessage({ type: "setupWamEventHandler" });
+    }
 
     getNumInputs() {
         return this.fJSONDsp.inputs;
@@ -252,8 +246,8 @@ export class FaustMonoAudioWorkletNode extends FaustAudioWorkletNode<false> impl
         throw e;
     }
 
-    constructor(context: BaseAudioContext, name: string, factory: LooseFaustDspFactory, sampleSize: number, nodeOptions: Partial<FaustAudioWorkletNodeOptions> = {}) {
-        super(context, name, factory, { name, factory, sampleSize }, nodeOptions);
+    constructor(context: BaseAudioContext, options: Partial<FaustAudioWorkletNodeOptions<false>> & Pick<FaustAudioWorkletNodeOptions<false>, "processorOptions">) {
+        super(context, options.processorOptions.name, options.processorOptions.factory, options);
     }
 }
 
@@ -269,30 +263,16 @@ export class FaustPolyAudioWorkletNode extends FaustAudioWorkletNode<true> imple
         throw e;
     }
 
-    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">) {
 
         super(
             context,
-            name,
-            voiceFactory,
-            {
-                name,
-                voiceFactory,
-                mixerModule,
-                voices,
-                sampleSize,
-                effectFactory
-            },
-            nodeOptions
+            options.processorOptions.name,
+            options.processorOptions.voiceFactory,
+            options
         );
 
-        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);

package/src/FaustAudioWorkletProcessor.ts

@@ -1,6 +1,7 @@
 import type FaustWasmInstantiator from "./FaustWasmInstantiator";
 import type { FaustBaseWebAudioDsp, FaustWebAudioDspVoice, FaustMonoWebAudioDsp, FaustPolyWebAudioDsp } from "./FaustWebAudioDsp";
-import type { AudioParamDescriptor, AudioWorkletGlobalScope, LooseFaustDspFactory, FaustDspMeta, FaustUIItem, AudioWorkletProcessor } from "./types";
+import type { AudioParamDescriptor, AudioWorkletGlobalScope, LooseFaustDspFactory, FaustDspMeta, FaustUIItem } from "./types";
+import type { AudioWorkletGlobalScope as WamAudioWorkletGlobalScope, WamParamMgrSDKBaseModuleScope } from "@webaudiomodules/sdk-parammgr";
 
 /**
  * Injected in the string to be compiled on AudioWorkletProcessor side
@@ -31,6 +32,9 @@ export interface FaustPolyAudioWorkletNodeOptions extends AudioWorkletNodeOption
 export interface FaustAudioWorkletProcessorOptions {
     name: string;
     sampleSize: number;
+    // for WAMs
+    moduleId?: string;
+    instanceId?: string;
 }
 export interface FaustMonoAudioWorkletProcessorOptions extends FaustAudioWorkletProcessorOptions {
     factory: LooseFaustDspFactory;
@@ -82,6 +86,8 @@ const getFaustAudioWorkletProcessor = <Poly extends boolean = false>(dependencie
 
         protected paramValuesCache: Record<string, number> = {};
 
+        protected wamInfo?: { moduleId: string; instanceId: string };
+
         constructor(options: FaustAudioWorkletNodeOptions<Poly>) {
             super(options);
 
@@ -92,6 +98,10 @@ const getFaustAudioWorkletProcessor = <Poly extends boolean = false>(dependencie
             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() {
@@ -107,6 +117,19 @@ const getFaustAudioWorkletProcessor = <Poly extends boolean = false>(dependencie
             return params;
         }
 
+        setupWamEventHandler() {
+            if (!this.wamInfo) return;
+            const { moduleId, instanceId } = this.wamInfo;
+	        const { webAudioModules } = (globalThis as unknown as WamAudioWorkletGlobalScope);
+            const ModuleScope = webAudioModules.getModuleScope(moduleId) as WamParamMgrSDKBaseModuleScope;
+            const paramMgrProcessor = ModuleScope?.paramMgrProcessors?.[instanceId];
+            if (!paramMgrProcessor) return;
+            if (paramMgrProcessor.handleEvent) return;
+            paramMgrProcessor.handleEvent = (event) => {
+                if (event.type === "wam-midi") this.midiMessage(event.data.bytes);
+            };
+        }
+
         process(inputs: Float32Array[][], outputs: Float32Array[][], parameters: { [key: string]: Float32Array }) {
 
             // Update controls (possibly needed for sample accurate control)
@@ -162,6 +185,10 @@ const getFaustAudioWorkletProcessor = <Poly extends boolean = false>(dependencie
                     }
                     break;
                 }
+                case "setupWamEventHandler": {
+                    this.setupWamEventHandler();
+                    break;
+                }
                 case "start": {
                     this.fDSPCode.start();
                     break;

package/src/FaustDspGenerator.ts

@@ -52,6 +52,7 @@ 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(
@@ -60,7 +61,8 @@ export interface IFaustMonoDspGenerator extends GeneratorSupportingSoundfiles {
         factory?: LooseFaustDspFactory,
         sp?: boolean,
         bufferSize?: number,
-        processorName?: string
+        processorName?: string,
+        processorOptions?: Record<string, any>
     ): Promise<IFaustMonoWebAudioNode | null>;
 
     /**
@@ -72,6 +74,7 @@ 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(
@@ -80,7 +83,8 @@ export interface IFaustMonoDspGenerator extends GeneratorSupportingSoundfiles {
         name?: string,
         factory?: LooseFaustDspFactory,
         fftOptions?: Partial<FaustFFTOptionsData>,
-        processorName?: string
+        processorName?: string,
+        processorOptions?: Record<string, any>
     ): Promise<FaustMonoAudioWorkletNode | null>;
 
     /**
@@ -148,6 +152,7 @@ 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(
@@ -159,7 +164,8 @@ export interface IFaustPolyDspGenerator extends GeneratorSupportingSoundfiles {
         effectFactory?: LooseFaustDspFactory | null,
         sp?: boolean,
         bufferSize?: number,
-        processorName?: string
+        processorName?: string,
+        processorOptions?: Record<string, any>
     ): Promise<IFaustPolyWebAudioNode | null>;
 
     /**
@@ -244,7 +250,8 @@ export class FaustMonoDspGenerator implements IFaustMonoDspGenerator {
         factory = this.factory as LooseFaustDspFactory,
         sp = false as SP,
         bufferSize = 1024,
-        processorName = factory?.shaKey || name
+        processorName = factory?.shaKey || name,
+        processorOptions: Record<string, any> = {}
     ): Promise<SP extends true ? FaustMonoScriptProcessorNode | null : FaustMonoAudioWorkletNode | null> {
         if (!factory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
 
@@ -307,7 +314,7 @@ const dependencies = {
                 }
             }
             // Create the AWN
-            const node = new FaustMonoAudioWorkletNode(context, processorName, factory, sampleSize);
+            const node = new FaustMonoAudioWorkletNode(context, { processorOptions: { name: processorName, factory, sampleSize, ...processorOptions } });
 
             return node as SP extends true ? FaustMonoScriptProcessorNode : FaustMonoAudioWorkletNode;
         }
@@ -319,7 +326,8 @@ const dependencies = {
         name = this.name,
         factory = this.factory as LooseFaustDspFactory,
         fftOptions: Partial<FaustFFTOptionsData> = {},
-        processorName = factory?.shaKey ? `${factory.shaKey}_fft` : name
+        processorName = factory?.shaKey ? `${factory.shaKey}_fft` : name,
+        processorOptions: Record<string, any> = {}
     ): Promise<FaustMonoAudioWorkletNode | null> {
         if (!factory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
 
@@ -375,7 +383,7 @@ const dependencies = {
             }
         }
         // Create the AWN
-        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) param.value = fftOptions.fftSize;
@@ -573,7 +581,8 @@ process = adaptorIns(dsp_code.process) : dsp_code.effect : adaptorOuts;
         effectFactory = this.effectFactory as LooseFaustDspFactory | null,
         sp = false as SP,
         bufferSize = 1024,
-        processorName = ((voiceFactory?.shaKey || "") + (effectFactory?.shaKey || "")) || `${name}_poly`
+        processorName = ((voiceFactory?.shaKey || "") + (effectFactory?.shaKey || "")) || `${name}_poly`,
+        processorOptions = {}
     ): Promise<SP extends true ? FaustPolyScriptProcessorNode | null : FaustPolyAudioWorkletNode | null> {
         if (!voiceFactory) throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
 
@@ -642,7 +651,7 @@ const dependencies = {
                 }
             }
             // Create the AWN
-            const node = new FaustPolyAudioWorkletNode(context, processorName, voiceFactory, mixerModule, voices, sampleSize, effectFactory || undefined);
+            const node = new FaustPolyAudioWorkletNode(context, { processorOptions: { name: processorName, voiceFactory, mixerModule, voices, sampleSize, effectFactory: effectFactory || undefined, ...processorOptions } });
 
             return node as SP extends true ? FaustPolyScriptProcessorNode : FaustPolyAudioWorkletNode;
         }

package/src/FaustFFTAudioWorkletProcessor.ts

@@ -2,6 +2,7 @@ import type { FaustMonoDspInstance } from "./FaustDspInstance";
 import type FaustWasmInstantiator from "./FaustWasmInstantiator";
 import type { FaustBaseWebAudioDsp, FaustMonoWebAudioDsp, PlotHandler } from "./FaustWebAudioDsp";
 import type { AudioParamDescriptor, AudioWorkletGlobalScope, LooseFaustDspFactory, FaustDspMeta, FaustUIItem, InterfaceFFT, TWindowFunction, Writeable, TypedArray, FFTUtils } from "./types";
+import type { AudioWorkletGlobalScope as WamAudioWorkletGlobalScope, WamParamMgrSDKBaseModuleScope } from "@webaudiomodules/sdk-parammgr";
 
 export interface FaustFFTOptionsData {
     fftSize: number;
@@ -33,6 +34,9 @@ export interface FaustFFTAudioWorkletProcessorOptions {
     name: string;
     sampleSize: number;
     factory: LooseFaustDspFactory;
+    // for WAMs
+    moduleId?: string;
+    instanceId?: string;
 }
 
 
@@ -122,6 +126,8 @@ const getFaustFFTAudioWorkletProcessor = (dependencies: FaustFFTAudioWorkletProc
 
         protected paramValuesCache: Record<string, number> = {};
 
+        protected wamInfo?: { moduleId: string; instanceId: string };
+
         private dspInstance!: FaustMonoDspInstance;
         private sampleSize!: number;
 
@@ -187,6 +193,10 @@ const getFaustFFTAudioWorkletProcessor = (dependencies: FaustFFTAudioWorkletProc
 
             // Init the FFT constructor and the Faust FFT Processor
             this.initFFT();
+
+            const { moduleId, instanceId } = options.processorOptions;
+            if (!moduleId || !instanceId) return;
+            this.wamInfo = { moduleId, instanceId };
         }
 
         async initFFT(): Promise<true> {
@@ -232,6 +242,19 @@ const getFaustFFTAudioWorkletProcessor = (dependencies: FaustFFTAudioWorkletProc
             ];
         }
 
+        setupWamEventHandler() {
+            if (!this.wamInfo) return;
+            const { moduleId, instanceId } = this.wamInfo;
+	        const { webAudioModules } = (globalThis as unknown as WamAudioWorkletGlobalScope);
+            const ModuleScope = webAudioModules.getModuleScope(moduleId) as WamParamMgrSDKBaseModuleScope;
+            const paramMgrProcessor = ModuleScope?.paramMgrProcessors?.[instanceId];
+            if (!paramMgrProcessor) return;
+            if (paramMgrProcessor.handleEvent) return;
+            paramMgrProcessor.handleEvent = (event) => {
+                if (event.type === "wam-midi") this.midiMessage(event.data.bytes);
+            };
+        }
+
         processFFT() {
             // Get the number of samples that need to proceed, from the input r/w pointers
             let samplesForFFT = mod(this.$inputWrite - this.$inputRead, this.fftBufferSize) || this.fftBufferSize;
@@ -400,6 +423,10 @@ const getFaustFFTAudioWorkletProcessor = (dependencies: FaustFFTAudioWorkletProc
                     this.fDSPCode?.setPlotHandler(this.fPlotHandler);
                     break;
                 }
+                case "setupWamEventHandler": {
+                    this.setupWamEventHandler();
+                    break;
+                }
                 case "start": {
                     this.fDSPCode?.start();
                     break;

package/src/FaustScriptProcessorNode.ts

@@ -40,20 +40,11 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
     async listenSensors() {
         if (this.hasAccInput) {
             const isAndroid: boolean = /Android/i.test(navigator.userAgent);
-            let handleDeviceMotion = null;
-            if (isAndroid) {
-                handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
-                    if (!accelerationIncludingGravity) return;
-                    const { x, y, z } = accelerationIncludingGravity;
-                    this.propagateAcc({ x, y, z }, true);
-                }
-            } else {
-                handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
-                    if (!accelerationIncludingGravity) return;
-                    const { x, y, z } = accelerationIncludingGravity;
-                    this.propagateAcc({ x, y, z });
-                }
-            }
+            const handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
+                if (!accelerationIncludingGravity) return;
+                const { x, y, z } = accelerationIncludingGravity;
+                this.propagateAcc({ x, y, z }, isAndroid);
+            };
             if (window.DeviceMotionEvent) {
                 if (typeof (window.DeviceMotionEvent as any).requestPermission === "function") { // for iOS 13+
                     try {

package/src/copyWebStandaloneAssets.d.ts

@@ -1,4 +1,4 @@
-declare const copyWebStandaloneAssets: (outputDir: string, dspName: string, poly: boolean) => void;
-declare const copyWebTemplateAssets: (outputDir: string, dspName: string, poly: boolean) => void;
+declare const copyWebStandaloneAssets: (outputDir: string, dspName: string, poly?: boolean, effect?: boolean) => void;
+declare const copyWebTemplateAssets: (outputDir: string, dspName: string, poly?: boolean, effect?: boolean) => void;
 
 export { copyWebStandaloneAssets, copyWebTemplateAssets };

package/src/copyWebStandaloneAssets.js

@@ -1,7 +1,7 @@
 //@ts-check
 import * as fs from "fs";
 import * as path from "path";
-import { cpSync, cpSyncModify, rmSync } from "../fileutils.js";
+import { cpSync, cpSyncModify } from "../fileutils.js";
 import { fileURLToPath } from "url";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -11,27 +11,30 @@ const __filename = fileURLToPath(import.meta.url);
  * @param {string} outputDir - The output directory.
  * @param {string} dspName - The name of the DSP to be loaded.
  * @param {boolean} [poly] - Whether the DSP is polyphonic.
+ * @param {boolean} [effect] - Whether the DSP has an effect module.
  */
-const copyWebStandaloneAssets = (outputDir, dspName, poly = false) => {
+const copyWebStandaloneAssets = (outputDir, dspName, poly = false, effect = false) => {
     console.log(`Writing assets files.`)
     const assetsPath = path.join(__dirname, "../assets/standalone");
     if (!fs.existsSync(outputDir)) fs.mkdirSync(outputDir);
 
+    const findAndReplace = ["FAUST_DSP_NAME", dspName];
+    if (poly) findAndReplace.push("FAUST_DSP_VOICES = 0", "FAUST_DSP_VOICES = 16");
+    if (poly && effect) findAndReplace.push("FAUST_DSP_HAS_EFFECT = false", "FAUST_DSP_HAS_EFFECT = true");
+
     // Copy some files
-    const templateJSPath = (poly) ? path.join(__dirname, "../assets/standalone/index-poly.js") : path.join(__dirname, "../assets/standalone/index.js");
-    cpSyncModify(templateJSPath, outputDir + `/${dspName}.js`, "FAUST_DSP", dspName);
+    const createNodeJSPath = path.join(__dirname, "../assets/standalone/create-node.js");
+    cpSyncModify(createNodeJSPath, outputDir + `/create-node.js`, ...findAndReplace);
+
+    const templateJSPath = path.join(__dirname, "../assets/standalone/index.js");
+    cpSyncModify(templateJSPath, outputDir + `/index.js`, ...findAndReplace);
 
     const templateHTMLPath = path.join(__dirname, "../assets/standalone/index.html");
-    //cpSyncModify(templateHTMLPath, outputDir + `/${dspName}.html`, "FAUST_DSP", dspName);
-    cpSyncModify(templateHTMLPath, outputDir + `/index.html`, "FAUST_DSP", dspName);
+    //cpSyncModify(templateHTMLPath, outputDir + `/${dspName}.html`, "FAUST_DSP_NAME", dspName);
+    cpSyncModify(templateHTMLPath, outputDir + `/index.html`, ...findAndReplace);
 
-    if (poly) {
-        const templateWorkerPath = path.join(__dirname, "../assets/standalone/service-worker-poly.js");
-        cpSyncModify(templateWorkerPath, outputDir + `/service-worker.js`, "FAUST_DSP", dspName);
-    } else {
-        const templateWorkerPath = path.join(__dirname, "../assets/standalone/service-worker.js");
-        cpSyncModify(templateWorkerPath, outputDir + `/service-worker.js`, "FAUST_DSP", dspName);
-    }
+    const templateWorkerPath = path.join(__dirname, "../assets/standalone/service-worker.js");
+    cpSyncModify(templateWorkerPath, outputDir + `/service-worker.js`, ...findAndReplace);
 
     const templateIconPath = path.join(__dirname, "../assets/standalone/icon.png");
     cpSync(templateIconPath, outputDir + `/icon.png`);
@@ -43,25 +46,33 @@ const copyWebStandaloneAssets = (outputDir, dspName, poly = false) => {
     cpSync(faustuiPath, outputDir + "/faust-ui");
 
     const templateManifestPath = path.join(__dirname, "../assets/standalone/manifest.json");
-    cpSyncModify(templateManifestPath, outputDir + `/manifest.json`, "FAUST_DSP", dspName);
+    cpSyncModify(templateManifestPath, outputDir + `/manifest.json`, ...findAndReplace);
 };
 
 /**
  * @param {string} outputDir - The output directory.
  * @param {string} dspName - The name of the DSP to be loaded.
  * @param {boolean} [poly] - Whether the DSP is polyphonic.
+ * @param {boolean} [effect] - Whether the DSP has an effect module.
  */
-const copyWebTemplateAssets = (outputDir, dspName, poly = false) => {
+const copyWebTemplateAssets = (outputDir, dspName, poly = false, effect = false) => {
 
     // Create output directory if it doesn't exist
     if (!fs.existsSync(outputDir)) fs.mkdirSync(outputDir);
 
+    const findAndReplace = ["FAUST_DSP_NAME", dspName];
+    if (poly) findAndReplace.push("FAUST_DSP_VOICES = 0", "FAUST_DSP_VOICES = 16");
+    if (poly && effect) findAndReplace.push("FAUST_DSP_HAS_EFFECT = false", "FAUST_DSP_HAS_EFFECT = true");
+
     // Copy some files
-    const templateJSPath = path.join(__dirname, "../assets/standalone/template.js");
-    cpSync(templateJSPath, outputDir + `/${dspName}.js`);
+    const createNodeJSPath = path.join(__dirname, "../assets/standalone/create-node.js");
+    cpSyncModify(createNodeJSPath, outputDir + `/create-node.js`, ...findAndReplace);
+
+    const templateJSPath = path.join(__dirname, "../assets/standalone/index-template.js");
+    cpSyncModify(templateJSPath, outputDir + `/index.js`, ...findAndReplace);
 
-    const templateHTMLPath = (poly) ? path.join(__dirname, "../assets/standalone/template-poly.html") : path.join(__dirname, "../assets/standalone/template.html");
-    cpSyncModify(templateHTMLPath, outputDir + `/${dspName}.html`, "FAUST_DSP", dspName);
+    const templateHTMLPath = path.join(__dirname, "../assets/standalone/index-template.html");
+    cpSyncModify(templateHTMLPath, outputDir + `/index.html`, "index-template.js", "index.js", ...findAndReplace);
 
     const faustwasmPath = path.join(__dirname, "../assets/standalone/faustwasm");
     cpSync(faustwasmPath, outputDir + "/faustwasm");

package/src/faust2wasmFiles.js

@@ -34,11 +34,11 @@ const faust2wasmFiles = async (inputFile, outputDir, argv = [], poly = false) =>
 
     if (!argv.find(a => a === "-I")) argv.push("-I", "libraries/");
     argv.push("-ftz", "2");
-    const dspModulePath = path.join(outputDir, `${dspName}.wasm`);
-    const dspMetaPath = path.join(outputDir, `${dspName}.json`);
-    const effectModulePath = path.join(outputDir, `${dspName}_effect.wasm`);
-    const effectMetaPath = path.join(outputDir, `${dspName}_effect.json`);
-    const mixerModulePath = path.join(outputDir, "mixerModule.wasm");
+    const dspModulePath = path.join(outputDir, `dsp-module.wasm`);
+    const dspMetaPath = path.join(outputDir, `dsp-meta.json`);
+    const effectModulePath = path.join(outputDir, `effect-module.wasm`);
+    const effectMetaPath = path.join(outputDir, `effect-meta.json`);
+    const mixerModulePath = path.join(outputDir, "mixer-module.wasm");
     /** @type {Uint8Array} */
     let dspModule;
     /** @type {import("./types").FaustDspMeta} */