@grame/faustwasm 0.10.1 → 0.10.2

package/assets/standalone/index-template.js

@@ -40,19 +40,20 @@ $buttonDsp.onclick = async () => {
     }
 }
 
+// Play some notes using the Faust node
+const play = (node) => {
+    node.keyOn(0, 60, 100);
+    setTimeout(() => node.keyOn(0, 64, 100), 1000);
+    setTimeout(() => node.keyOn(0, 67, 100), 2000);
+    setTimeout(() => node.allNotesOff(), 5000);
+    setTimeout(() => play(node), 7000);
+}
+
 // Called at load time
 (async () => {
 
     const { createFaustNode, connectToAudioInput } = await import("./create-node.js");
 
-    const play = (node) => {
-        node.keyOn(0, 60, 100);
-        setTimeout(() => node.keyOn(0, 64, 100), 1000);
-        setTimeout(() => node.keyOn(0, 67, 100), 2000);
-        setTimeout(() => node.allNotesOff(), 5000);
-        setTimeout(() => play(node), 7000);
-    }
-
     // Create Faust node
     const result = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES);
     faustNode = result.faustNode;  // Assign to the global variable

package/package.json

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

package/assets/standalone/index copie.js

@@ -1,171 +0,0 @@
-// Set to > 0 if the DSP is polyphonic
-const FAUST_DSP_VOICES = 0;
-
-/**
- * @typedef {import("./faustwasm").FaustAudioWorkletNode} FaustAudioWorkletNode
- * @typedef {import("./faustwasm").FaustDspMeta} FaustDspMeta
- * @typedef {import("./faustwasm").FaustUIDescriptor} FaustUIDescriptor
- * @typedef {import("./faustwasm").FaustUIGroup} FaustUIGroup
- * @typedef {import("./faustwasm").FaustUIItem} FaustUIItem
- */
-
-/**
- * Registers the service worker.
- */
-if ("serviceWorker" in navigator) {
-    window.addEventListener("load", () => {
-        navigator.serviceWorker.register("./service-worker.js")
-            .then(reg => console.log("Service Worker registered", reg))
-            .catch(err => console.log("Service Worker registration failed", err));
-    });
-}
-
-/** @type {HTMLSpanElement} */
-const $spanAudioInput = document.getElementById("audio-input");
-/** @type {HTMLSpanElement} */
-const $spanMidiInput = document.getElementById("midi-input");
-/** @type {HTMLSelectElement} */
-const $selectAudioInput = document.getElementById("select-audio-input");
-/** @type {HTMLSelectElement} */
-const $selectMidiInput = document.getElementById("select-midi-input");
-/** @type {HTMLSelectElement} */
-const $buttonDsp = document.getElementById("button-dsp");
-/** @type {HTMLDivElement} */
-const $divFaustUI = document.getElementById("div-faust-ui");
-
-/** @type {typeof AudioContext} */
-const AudioCtx = window.AudioContext || window.webkitAudioContext;
-const audioContext = new AudioCtx({ latencyHint: 0.00001 });
-audioContext.destination.channelInterpretation = "discrete";
-audioContext.suspend();
-
-$buttonDsp.disabled = true;
-
-// Declare faustNode as a global variable
-let faustNode;
-
-// Called at load time
-(async () => {
-
-    const { createFaustNode, createKey2MIDI, connectToAudioInput, createFaustUI } = await import("./create-node.js");
-
-    /**
-    * @param {FaustAudioWorkletNode} faustNode 
-    */
-    const buildAudioDeviceMenu = async (faustNode) => {
-
-        let inputStreamNode = null;
-        const handleDeviceChange = async () => {
-            const devicesInfo = await navigator.mediaDevices.enumerateDevices();
-            $selectAudioInput.innerHTML = "";
-            devicesInfo.forEach((deviceInfo, i) => {
-                const { kind, deviceId, label } = deviceInfo;
-                if (kind === "audioinput") {
-                    const option = new Option(label || `microphone ${i + 1}`, deviceId);
-                    $selectAudioInput.add(option);
-                }
-            });
-        }
-        await handleDeviceChange();
-        navigator.mediaDevices.addEventListener("devicechange", handleDeviceChange)
-        $selectAudioInput.onchange = async () => {
-            const id = $selectAudioInput.value;
-            if (faustNode.getNumInputs() > 0) {
-                inputStreamNode = await connectToAudioInput(audioContext, id, faustNode, inputStreamNode);
-            }
-        };
-
-        // Connect to the default audio input device
-        if (faustNode.getNumInputs() > 0) {
-            inputStreamNode = await connectToAudioInput(audioContext, null, faustNode, inputStreamNode);
-        }
-    };
-
-    /**
-     * @param {FaustAudioWorkletNode} faustNode 
-     */
-    const buildMidiDeviceMenu = async (faustNode) => {
-
-        // Keyboard to MIDI handing
-        let keyboard2MIDI = createKey2MIDI((event) => faustNode.midiMessage(event));
-        keyboard2MIDI.start();
-
-        const midiAccess = await navigator.requestMIDIAccess();
-        /** @type {WebMidi.MIDIInput} */
-        let currentInput;
-        /**
-         * @param {WebMidi.MIDIMessageEvent} e
-         */
-        const handleMidiMessage = e => faustNode.midiMessage(e.data);
-        const handleStateChange = () => {
-            const { inputs } = midiAccess;
-            if ($selectMidiInput.options.length === inputs.size + 1) return;
-            if (currentInput) currentInput.removeEventListener("midimessage", handleMidiMessage);
-            $selectMidiInput.innerHTML = '<option value="-1" disabled selected>Select...</option>';
-            inputs.forEach((midiInput) => {
-                const { name, id } = midiInput;
-                const option = new Option(name, id);
-                $selectMidiInput.add(option);
-            });
-        };
-        handleStateChange();
-        midiAccess.addEventListener("statechange", handleStateChange);
-        $selectMidiInput.onchange = () => {
-            if (currentInput) currentInput.removeEventListener("midimessage", handleMidiMessage);
-            const id = $selectMidiInput.value;
-            currentInput = midiAccess.inputs.get(id);
-            currentInput.addEventListener("midimessage", handleMidiMessage);
-        };
-    };
-
-    // To test the ScriptProcessorNode mode
-    // const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES, true);
-    const result = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES);
-    faustNode = result.faustNode;  // Assign to the global variable
-    if (!faustNode) throw new Error("Faust DSP not compiled");
-
-    // Create the Faust UI
-    await createFaustUI($divFaustUI, faustNode);
-
-    // Connect the Faust node to the audio output
-    faustNode.connect(audioContext.destination);
-
-    // Build the audio device menu
-    if (faustNode.numberOfInputs > 0) await buildAudioDeviceMenu(faustNode);
-    else $spanAudioInput.hidden = true;
-
-    // Build the MIDI device menu
-    if (navigator.requestMIDIAccess) await buildMidiDeviceMenu(faustNode);
-    else $spanMidiInput.hidden = true;
-
-})();
-
-// Set the title and enable the DSP button
-$buttonDsp.disabled = false;
-document.title = name;
-let sensorHandlersBound = false;
-
-// Activate AudioContext and Sensors on user interaction
-$buttonDsp.onclick = async () => {
-
-    // Import the requestPermissions function
-    const { requestPermissions } = await import("./create-node.js");
-
-    // Request permission for sensors
-    await requestPermissions();
-
-    // Activate sensor listeners
-    if (!sensorHandlersBound) {
-        await faustNode.startSensors();
-        sensorHandlersBound = true;
-    }
-
-    // Activate or suspend the AudioContext
-    if (audioContext.state === "running") {
-        $buttonDsp.textContent = "Suspended";
-        await audioContext.suspend();
-    } else if (audioContext.state === "suspended") {
-        $buttonDsp.textContent = "Running";
-        await audioContext.resume();
-    }
-}

package/assets/standalone/index-pwa-Wakelock.js

@@ -1,254 +0,0 @@
-// Set to > 0 if the DSP is polyphonic
-const FAUST_DSP_VOICES = 0;
-
-/**
- * @typedef {import("./faustwasm").FaustAudioWorkletNode} FaustAudioWorkletNode
- * @typedef {import("./faustwasm").FaustDspMeta} FaustDspMeta
- * @typedef {import("./faustwasm").FaustUIDescriptor} FaustUIDescriptor
- * @typedef {import("./faustwasm").FaustUIGroup} FaustUIGroup
- * @typedef {import("./faustwasm").FaustUIItem} FaustUIItem
- */
-
-/**
- * Registers the service worker.
- */
-if ("serviceWorker" in navigator) {
-    window.addEventListener("load", () => {
-        navigator.serviceWorker.register("./service-worker.js")
-            .then(reg => console.log("Service Worker registered", reg))
-            .catch(err => console.log("Service Worker registration failed", err));
-    });
-}
-
-/** @type {HTMLDivElement} */
-const $divFaustUI = document.getElementById("div-faust-ui");
-
-/** @type {typeof AudioContext} */
-const AudioCtx = window.AudioContext || window.webkitAudioContext;
-const audioContext = new AudioCtx({ latencyHint: 0.00001 });
-audioContext.destination.channelInterpretation = "discrete";
-audioContext.suspend();
-
-// Declare faustNode as a global variable
-let faustNode;
-
-// Called at load time
-(async () => {
-
-    // Import the create-node module
-    const { createFaustNode, createFaustUI } = await import("./create-node.js");
-
-    // To test the ScriptProcessorNode mode
-    // const result = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES, true, 512);
-    const result = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES);
-    faustNode = result.faustNode;  // Assign to the global variable
-    if (!faustNode) throw new Error("Faust DSP not compiled");
-
-    // Create the Faust UI
-    await createFaustUI($divFaustUI, faustNode);
-
-})();
-
-// Synchronous function to resume AudioContext, to be called first in the synchronous event listener
-function resumeAudioContext() {
-    if (audioContext.state === 'suspended') {
-        audioContext.resume().then(() => {
-            console.log('AudioContext resumed successfully');
-        }).catch(error => {
-            console.error('Error when resuming AudioContext:', error);
-        });
-    }
-}
-
-// Function to start MIDI
-function startMIDI() {
-    // Check if the browser supports the Web MIDI API
-    if (navigator.requestMIDIAccess) {
-        navigator.requestMIDIAccess().then(
-            midiAccess => {
-                console.log("MIDI Access obtained.");
-                for (let input of midiAccess.inputs.values()) {
-                    input.onmidimessage = (event) => faustNode.midiMessage(event.data);
-                    console.log(`Connected to input: ${input.name}`);
-                }
-            },
-            () => console.error("Failed to access MIDI devices.")
-        );
-    } else {
-        console.log("Web MIDI API is not supported in this browser.");
-    }
-}
-
-// Function to stop MIDI
-function stopMIDI() {
-    // Check if the browser supports the Web MIDI API
-    if (navigator.requestMIDIAccess) {
-        navigator.requestMIDIAccess().then(
-            midiAccess => {
-                console.log("MIDI Access obtained.");
-                for (let input of midiAccess.inputs.values()) {
-                    input.onmidimessage = null;
-                    console.log(`Disconnected from input: ${input.name}`);
-                }
-            },
-            () => console.error("Failed to access MIDI devices.")
-        );
-    } else {
-        console.log("Web MIDI API is not supported in this browser.");
-    }
-}
-
-// Flag to check if sensor handlers are bound
-let sensorHandlersBound = false;
-// Flag to check if MIDI handlers are bound
-let midiHandlersBound = false;
-
-// === Wake Lock Manager ===
-const WakeLockManager = (() => {
-    let wakeLock = null;
-    let enabled = false;
-
-    function request() {
-        if (!('wakeLock' in navigator)) return;
-        if (document.visibilityState !== 'visible') return;
-        if (wakeLock === null) {
-            navigator.wakeLock.request('screen')
-                .then(lock => {
-                    wakeLock = lock;
-                    console.log('[WakeLockManager] Wake Lock acquired');
-                    wakeLock.addEventListener('release', () => {
-                        console.log('[WakeLockManager] Wake Lock was released');
-                        wakeLock = null;
-                        if (enabled && document.visibilityState === 'visible') {
-                            request();
-                        }
-                    });
-                })
-                .catch(err => {
-                    console.error('[WakeLockManager] Failed to acquire Wake Lock:', err);
-                });
-        }
-    }
-
-    function release() {
-        if (wakeLock !== null) {
-            wakeLock.release()
-                .then(() => {
-                    console.log('[WakeLockManager] Wake Lock manually released');
-                    wakeLock = null;
-                })
-                .catch(err => {
-                    console.error('[WakeLockManager] Failed to release Wake Lock:', err);
-                });
-        }
-    }
-
-    function enable() {
-        enabled = true;
-        request();
-    }
-
-    function disable() {
-        enabled = false;
-        release();
-    }
-
-    document.addEventListener('visibilitychange', () => {
-        if (enabled && document.visibilityState === 'visible') {
-            request();
-        }
-    });
-
-    return {
-        enable,
-        disable,
-        isActive: () => wakeLock !== null,
-        isEnabled: () => enabled,
-    };
-})();
-
-// Function to activate MIDI and Sensors on user interaction
-async function activateMIDISensors() {
-
-    // Import the create-node module
-    const { connectToAudioInput, requestPermissions } = await import("./create-node.js");
-
-    // Request permission for sensors
-    await requestPermissions();
-
-    // Activate sensor listeners
-    if (!sensorHandlersBound) {
-        await faustNode.startSensors();
-        sensorHandlersBound = true;
-    }
-
-    // Initialize the MIDI setup
-    if (!midiHandlersBound) {
-        startMIDI();
-        midiHandlersBound = true;
-    }
-
-    // Connect the Faust node to the audio output
-    faustNode.connect(audioContext.destination);
-
-    // Connect the Faust node to the audio input
-    if (faustNode.numberOfInputs > 0) {
-        await connectToAudioInput(audioContext, null, faustNode, null);
-    }
-
-    // Resume the AudioContext
-    if (audioContext.state === 'suspended') {
-        await audioContext.resume();
-    }
-}
-
-// Function to suspend AudioContext, deactivate MIDI and Sensors on user interaction
-async function deactivateAudioMIDISensors() {
-
-    // Suspend the AudioContext
-    if (audioContext.state === 'running') {
-        await audioContext.suspend();
-    }
-
-    // Deactivate sensor listeners
-    if (sensorHandlersBound) {
-        faustNode.stopSensors();
-        sensorHandlersBound = false;
-    }
-
-    // Deactivate the MIDI setup
-    if (midiHandlersBound && FAUST_DSP_VOICES > 0) {
-        stopMIDI();
-        midiHandlersBound = false;
-    }
-}
-
-// Event listener to handle user interaction
-function handleUserInteraction() {
-
-    if (WakeLockManager.isEnabled()) {
-        WakeLockManager.disable();
-    } else {
-        WakeLockManager.enable();
-    }
-
-    // Resume AudioContext synchronously
-    resumeAudioContext();
-
-    // Launch the activation of MIDI and Sensors
-    activateMIDISensors().catch(error => {
-        console.error('Error when activating audio, MIDI and sensors:', error);
-    });
-}
-
-// Activate AudioContext, MIDI and Sensors on user interaction
-window.addEventListener('click', handleUserInteraction);
-window.addEventListener('touchstart', handleUserInteraction);
-
-// Deactivate AudioContext, MIDI and Sensors on user interaction
-window.addEventListener('visibilitychange', function () {
-    if (document.visibilityState === 'hidden') {
-        WakeLockManager.disable();
-        deactivateAudioMIDISensors();
-    }
-});