@grame/faustwasm 0.9.5 → 0.10.0

package/package.json

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

package/test/{organ1 → organ}/create-node.js

@@ -21,7 +21,7 @@
  */
 const createFaustNode = async (audioContext, dspName = "template", voices = 0, sp = false, bufferSize = 512) => {
     // Set to true if the DSP has an effect
-    const FAUST_DSP_HAS_EFFECT = true;
+    const FAUST_DSP_HAS_EFFECT = false;
 
     // Import necessary Faust modules and data
     const { FaustMonoDspGenerator, FaustPolyDspGenerator } = await import("./faustwasm/index.js");
@@ -172,6 +172,81 @@ async function requestPermissions() {
     }
 }
 
+/**
+ * Key2Midi: maps keyboard input to MIDI messages.
+ */
+class Key2Midi {
+    static KEY_MAP = {
+        a: 0, w: 1, s: 2, e: 3, d: 4, f: 5, t: 6, g: 7,
+        y: 8, h: 9, u: 10, j: 11, k: 12, o: 13, l: 14, p: 15, ";": 16,
+        z: "PREV", x: "NEXT", c: "VELDOWN", v: "VELUP"
+    };
+
+    constructor({ keyMap = Key2Midi.KEY_MAP, offset = 60, velocity = 100, handler = console.log } = {}) {
+        this.keyMap = keyMap;
+        this.offset = offset;
+        this.velocity = velocity;
+        this.velMap = [20, 40, 60, 80, 100, 127];
+        this.handler = handler;
+        this.pressed = {};
+
+        this.onKeyDown = this.onKeyDown.bind(this);
+        this.onKeyUp = this.onKeyUp.bind(this);
+    }
+
+    start() {
+        window.addEventListener("keydown", this.onKeyDown);
+        window.addEventListener("keyup", this.onKeyUp);
+    }
+
+    stop() {
+        window.removeEventListener("keydown", this.onKeyDown);
+        window.removeEventListener("keyup", this.onKeyUp);
+    }
+
+    onKeyDown(e) {
+        const key = e.key.toLowerCase();
+        if (this.pressed[key]) return;
+        this.pressed[key] = true;
+
+        const val = this.keyMap[key];
+        if (typeof val === "number") {
+            const note = val + this.offset;
+            this.handler([0x90, note, this.velocity]);
+        } else if (val === "PREV") {
+            this.offset -= 1;
+        } else if (val === "NEXT") {
+            this.offset += 1;
+        } else if (val === "VELDOWN") {
+            const idx = Math.max(0, this.velMap.indexOf(this.velocity) - 1);
+            this.velocity = this.velMap[idx];
+        } else if (val === "VELUP") {
+            const idx = Math.min(this.velMap.length - 1, this.velMap.indexOf(this.velocity) + 1);
+            this.velocity = this.velMap[idx];
+        }
+    }
+
+    onKeyUp(e) {
+        const key = e.key.toLowerCase();
+        const val = this.keyMap[key];
+        if (typeof val === "number") {
+            const note = val + this.offset;
+            this.handler([0x80, note, this.velocity]);
+        }
+        delete this.pressed[key];
+    }
+}
+
+/**
+ * Creates a Key2Midi instance.
+ * 
+ * @param {function} handler - The function to handle MIDI messages.
+ * @returns {Key2Midi} - The Key2Midi instance.
+ */
+function createKey2MIDI(handler) {
+    return new Key2Midi({ handler: handler });
+}
+
 // Export the functions
-export { createFaustNode, createFaustUI, connectToAudioInput, requestPermissions };
+export { createFaustNode, createFaustUI, createKey2MIDI, connectToAudioInput, requestPermissions };
 

package/test/{organ1 → organ}/dsp-meta.json

@@ -1,8 +1,8 @@
 {
-    "name": "organ1",
-    "filename": "organ1",
-    "version": "2.80.3",
-    "compile_options": "-lang wasm-e -ct 1 -es 1 -mcd 16 -mdd 1024 -mdy 33 -single -ftz 2",
+    "name": "organ",
+    "filename": "organ",
+    "version": "2.80.4",
+    "compile_options": "-lang wasm-i -ct 1 -es 1 -mcd 16 -mdd 1024 -mdy 33 -single -ftz 2",
     "library_list": [
         "/usr/share/faust/stdfaust.lib",
         "/usr/share/faust/oscillators.lib",
@@ -18,8 +18,9 @@
         "."
     ],
     "size": 262264,
+    "code": "aFrT",
     "inputs": 0,
-    "outputs": 2,
+    "outputs": 1,
     "meta": [
         {
             "basics.lib/name": "Faust Basic Element Library"
@@ -28,7 +29,7 @@
             "basics.lib/version": "1.21.0"
         },
         {
-            "compile_options": "-lang wasm-e -ct 1 -es 1 -mcd 16 -mdd 1024 -mdy 33 -single -ftz 2"
+            "compile_options": "-lang wasm-i -ct 1 -es 1 -mcd 16 -mdd 1024 -mdy 33 -single -ftz 2"
         },
         {
             "envelopes.lib/adsr:author": "Yann Orlarey and Andrey Bundin"
@@ -49,7 +50,7 @@
             "envelopes.lib/version": "1.3.0"
         },
         {
-            "filename": "organ1"
+            "filename": "organ"
         },
         {
             "maths.lib/author": "GRAME"
@@ -67,7 +68,7 @@
             "maths.lib/version": "2.8.1"
         },
         {
-            "name": "organ1"
+            "name": "organ"
         },
         {
             "oscillators.lib/name": "Faust Oscillator Library"
@@ -85,15 +86,20 @@
     "ui": [
         {
             "type": "vgroup",
-            "label": "organ1",
+            "label": "organ",
             "items": [
                 {
                     "type": "hslider",
                     "label": "freq",
                     "varname": "fHslider1",
                     "shortname": "freq",
-                    "address": "/organ1/freq",
+                    "address": "/organ/freq",
                     "index": 262168,
+                    "meta": [
+                        {
+                            "midi": "ctrl 7"
+                        }
+                    ],
                     "init": 440,
                     "min": 20,
                     "max": 3000,
@@ -104,7 +110,7 @@
                     "label": "gain",
                     "varname": "fHslider0",
                     "shortname": "gain",
-                    "address": "/organ1/gain",
+                    "address": "/organ/gain",
                     "index": 262144,
                     "init": 0.5,
                     "min": 0,
@@ -116,7 +122,7 @@
                     "label": "gate",
                     "varname": "fButton0",
                     "shortname": "gate",
-                    "address": "/organ1/gate",
+                    "address": "/organ/gate",
                     "index": 262212
                 }
             ]

package/test/{organ1 → organ}/index.js

@@ -1,5 +1,5 @@
 // Set to > 0 if the DSP is polyphonic
-const FAUST_DSP_VOICES = 16;
+const FAUST_DSP_VOICES = 0;
 
 /**
  * @typedef {import("./faustwasm").FaustAudioWorkletNode} FaustAudioWorkletNode
@@ -39,8 +39,8 @@ let faustNode;
     const { createFaustNode, createFaustUI } = await import("./create-node.js");
 
     // To test the ScriptProcessorNode mode
-    // const result = await createFaustNode(audioContext, "organ1", FAUST_DSP_VOICES, true, 512);
-    const result = await createFaustNode(audioContext, "organ1", FAUST_DSP_VOICES);
+    // const result = await createFaustNode(audioContext, "organ", FAUST_DSP_VOICES, true, 512);
+    const result = await createFaustNode(audioContext, "organ", FAUST_DSP_VOICES);
     faustNode = result.faustNode;  // Assign to the global variable
     if (!faustNode) throw new Error("Faust DSP not compiled");
 
@@ -101,6 +101,22 @@ function stopMIDI() {
 let sensorHandlersBound = false;
 let midiHandlersBound = false;
 
+// Keyboard to MIDI handing
+let keyboard2MIDI = null;
+
+async function startKeyboard2MIDI() {
+    // Import the create-node module
+    const { createKey2MIDI } = await import("./create-node.js");
+
+    keyboard2MIDI = createKey2MIDI((event) => faustNode.midiMessage(event));
+    keyboard2MIDI.start();
+}
+
+function stopKeyboard2MIDI() {
+    keyboard2MIDI.stop();
+    keyboard2MIDI = null;
+}
+
 // Function to activate MIDI and Sensors on user interaction
 async function activateMIDISensors() {
 
@@ -119,6 +135,7 @@ async function activateMIDISensors() {
     // Initialize the MIDI setup
     if (!midiHandlersBound) {
         startMIDI();
+        await startKeyboard2MIDI();
         midiHandlersBound = true;
     }
 
@@ -153,6 +170,7 @@ async function deactivateAudioMIDISensors() {
     // Deactivate the MIDI setup
     if (midiHandlersBound && FAUST_DSP_VOICES > 0) {
         stopMIDI();
+        stopKeyboard2MIDI();
         midiHandlersBound = false;
     }
 }

package/test/{organ1 → organ}/manifest.json

@@ -1,8 +1,8 @@
 {
-  "name": "Faust organ1",
-  "short_name": "organ1",
+  "name": "Faust organ",
+  "short_name": "organ",
   "start_url": "./index.html",
-  "description": "Progressive Web App for organ1",
+  "description": "Progressive Web App for organ",
   "display": "standalone",
   "background_color": "#ffffff",
   "theme_color": "#000000",

package/test/{organ1 → organ}/service-worker.js

@@ -1,11 +1,11 @@
 /// <reference lib="webworker" /> 
 
 // Set to > 0 if the DSP is polyphonic
-const FAUST_DSP_VOICES = 16;
+const FAUST_DSP_VOICES = 0;
 // Set to true if the DSP has an effect
-const FAUST_DSP_HAS_EFFECT = true;
+const FAUST_DSP_HAS_EFFECT = false;
 
-const CACHE_NAME = "organ1_20250412-1721"; // Cache name with versioning
+const CACHE_NAME = "organ_20250522-1139"; // Cache name with versioning
 
 /**
  * List of essential resources required for the **Mono DSP** version of the application.

package/test/organ1/effect-meta.json

@@ -1,118 +0,0 @@
-{
-    "name": "organ1",
-    "filename": "organ1",
-    "version": "2.80.3",
-    "compile_options": "-lang wasm-e -inpl -ct 1 -es 1 -mcd 16 -mdd 1024 -mdy 33 -single -ftz 2",
-    "library_list": [
-        "/usr/share/faust/stdfaust.lib",
-        "/usr/share/faust/oscillators.lib",
-        "/usr/share/faust/platform.lib",
-        "/usr/share/faust/maths.lib",
-        "/usr/share/faust/basics.lib",
-        "/usr/share/faust/envelopes.lib"
-    ],
-    "include_pathnames": [
-        "/share/faust",
-        "/usr/local/share/faust",
-        "/usr/share/faust",
-        "."
-    ],
-    "size": 12,
-    "code": "qO/O",
-    "inputs": 2,
-    "outputs": 2,
-    "meta": [
-        {
-            "basics.lib/name": "Faust Basic Element Library"
-        },
-        {
-            "basics.lib/version": "1.21.0"
-        },
-        {
-            "compile_options": "-lang wasm-e -inpl -ct 1 -es 1 -mcd 16 -mdd 1024 -mdy 33 -single -ftz 2"
-        },
-        {
-            "envelopes.lib/adsr:author": "Yann Orlarey and Andrey Bundin"
-        },
-        {
-            "envelopes.lib/author": "GRAME"
-        },
-        {
-            "envelopes.lib/copyright": "GRAME"
-        },
-        {
-            "envelopes.lib/license": "LGPL with exception"
-        },
-        {
-            "envelopes.lib/name": "Faust Envelope Library"
-        },
-        {
-            "envelopes.lib/version": "1.3.0"
-        },
-        {
-            "filename": "organ1"
-        },
-        {
-            "maths.lib/author": "GRAME"
-        },
-        {
-            "maths.lib/copyright": "GRAME"
-        },
-        {
-            "maths.lib/license": "LGPL with exception"
-        },
-        {
-            "maths.lib/name": "Faust Math Library"
-        },
-        {
-            "maths.lib/version": "2.8.1"
-        },
-        {
-            "name": "organ1"
-        },
-        {
-            "oscillators.lib/name": "Faust Oscillator Library"
-        },
-        {
-            "oscillators.lib/version": "1.6.0"
-        },
-        {
-            "platform.lib/name": "Generic Platform Library"
-        },
-        {
-            "platform.lib/version": "1.3.0"
-        }
-    ],
-    "ui": [
-        {
-            "type": "vgroup",
-            "label": "organ1",
-            "items": [
-                {
-                    "type": "hslider",
-                    "label": "Left",
-                    "varname": "fHslider0",
-                    "shortname": "Left",
-                    "address": "/organ1/Left",
-                    "index": 0,
-                    "init": 0.1,
-                    "min": 0,
-                    "max": 1,
-                    "step": 0.01
-                },
-                {
-                    "type": "hslider",
-                    "label": "Right",
-                    "varname": "fHslider1",
-                    "shortname": "Right",
-                    "address": "/organ1/Right",
-                    "index": 4,
-                    "init": 0.1,
-                    "min": 0,
-                    "max": 1,
-                    "step": 0.01
-                }
-            ]
-        }
-    ]
-}