@grame/faustwasm 0.4.6 → 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.6",
+  "version": "0.4.8",
   "description": "WebAssembly version of Faust Compiler",
   "main": "dist/cjs/index.js",
   "types": "dist/esm/index.d.ts",

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

@@ -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 {

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} */

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

@@ -3719,22 +3719,12 @@ var FaustAudioWorkletNode = class extends (globalThis.AudioWorkletNode || null)
   async listenSensors() {
     if (this.hasAccInput) {
       const isAndroid = /Android/i.test(navigator.userAgent);
-      let handleDeviceMotion = null;
-      if (isAndroid) {
-        handleDeviceMotion = ({ accelerationIncludingGravity }) => {
-          if (!accelerationIncludingGravity)
-            return;
-          const { x, y, z } = accelerationIncludingGravity;
-          this.propagateAcc({ x, y, z }, true);
-        };
-      } else {
-        handleDeviceMotion = ({ accelerationIncludingGravity }) => {
-          if (!accelerationIncludingGravity)
-            return;
-          const { x, y, z } = accelerationIncludingGravity;
-          this.propagateAcc({ x, y, z });
-        };
-      }
+      const handleDeviceMotion = ({ accelerationIncludingGravity }) => {
+        if (!accelerationIncludingGravity)
+          return;
+        const { x, y, z } = accelerationIncludingGravity;
+        this.propagateAcc({ x, y, z }, isAndroid);
+      };
       if (window.DeviceMotionEvent) {
         if (typeof window.DeviceMotionEvent.requestPermission === "function") {
           try {
@@ -3983,22 +3973,12 @@ var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode ||
   async listenSensors() {
     if (this.hasAccInput) {
       const isAndroid = /Android/i.test(navigator.userAgent);
-      let handleDeviceMotion = null;
-      if (isAndroid) {
-        handleDeviceMotion = ({ accelerationIncludingGravity }) => {
-          if (!accelerationIncludingGravity)
-            return;
-          const { x, y, z } = accelerationIncludingGravity;
-          this.propagateAcc({ x, y, z }, true);
-        };
-      } else {
-        handleDeviceMotion = ({ accelerationIncludingGravity }) => {
-          if (!accelerationIncludingGravity)
-            return;
-          const { x, y, z } = accelerationIncludingGravity;
-          this.propagateAcc({ x, y, z });
-        };
-      }
+      const handleDeviceMotion = ({ accelerationIncludingGravity }) => {
+        if (!accelerationIncludingGravity)
+          return;
+        const { x, y, z } = accelerationIncludingGravity;
+        this.propagateAcc({ x, y, z }, isAndroid);
+      };
       if (window.DeviceMotionEvent) {
         if (typeof window.DeviceMotionEvent.requestPermission === "function") {
           try {