@grame/faustwasm 0.8.0 → 0.8.2

package/assets/standalone/index-pwa.js

@@ -29,120 +29,155 @@ 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 () => {
 
-    const { createFaustNode, createFaustUI, connectToAudioInput } = await import("./create-node.js");
+    // Import the create-node module
+    const { createFaustNode, createFaustUI } = await import("./create-node.js");
 
     // To test the ScriptProcessorNode mode
-    //const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "osc", FAUST_DSP_VOICES, true, 512);
-    const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "osc", FAUST_DSP_VOICES);
+    // const result = await createFaustNode(audioContext, "osc", FAUST_DSP_VOICES, true, 512);
+    const result = await createFaustNode(audioContext, "osc", 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);
 
-    // 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.");
-        }
+})();
+
+// 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.");
+    }
+}
+
+let sensorHandlersBound = false;
+let midiHandlersBound = false;
+
+// 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");
 
-    // 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.");
-        }
+    // Request permission for sensors
+    await requestPermissions();
+
+    // Activate sensor listeners
+    if (!sensorHandlersBound) {
+        await faustNode.startSensors();
+        sensorHandlersBound = true;
     }
 
-    let sensorHandlersBound = false;
-    let midiHandlersBound = false;
+    // Initialize the MIDI setup
+    if (!midiHandlersBound && FAUST_DSP_VOICES > 0) {
+        startMIDI();
+        midiHandlersBound = true;
+    }
 
-    // Function to resume AudioContext, activate MIDI and Sensors on user interaction
-    async function activateAudioMIDISensors() {
+    // Connect the Faust node to the audio output
+    faustNode.connect(audioContext.destination);
 
-        // Activate sensor listeners
-        if (!sensorHandlersBound) {
-            await faustNode.startSensors();
-            sensorHandlersBound = true;
-        }
+    // Connect the Faust node to the audio input
+    if (faustNode.numberOfInputs > 0) {
+        await connectToAudioInput(audioContext, null, faustNode, null);
+    }
 
-        // Initialize the MIDI setup
-        if (!midiHandlersBound && FAUST_DSP_VOICES > 0) {
-            startMIDI();
-            midiHandlersBound = true;
-        }
+    // Resume the AudioContext
+    if (audioContext.state === 'suspended') {
+        await audioContext.resume();
+    }
+}
 
-        // Connect the Faust node to the audio output
-        faustNode.connect(audioContext.destination);
+// Function to suspend AudioContext, deactivate MIDI and Sensors on user interaction
+async function deactivateAudioMIDISensors() {
 
-        // Connect the Faust node to the audio input
-        if (faustNode.numberOfInputs > 0) {
-            await connectToAudioInput(audioContext, null, faustNode, null);
-        }
+    // Suspend the AudioContext
+    if (audioContext.state === 'running') {
+        await audioContext.suspend();
+    }
 
-        // Resume the AudioContext
-        if (audioContext.state === 'suspended') {
-            await audioContext.resume();
-        }
+    // Deactivate sensor listeners
+    if (sensorHandlersBound) {
+        faustNode.stopSensors();
+        sensorHandlersBound = false;
     }
 
-    // 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;
-        }
+    // Deactivate the MIDI setup
+    if (midiHandlersBound && FAUST_DSP_VOICES > 0) {
+        stopMIDI();
+        midiHandlersBound = false;
     }
+}
 
-    // Add event listeners for user interactions
+// Event listener to handle user interaction
+function handleUserInteraction() {
 
-    // Activate AudioContext, MIDI and Sensors on user interaction
-    window.addEventListener('click', activateAudioMIDISensors);
-    window.addEventListener('touchstart', activateAudioMIDISensors);
+    // Resume AudioContext synchronously
+    resumeAudioContext();
 
-    // Deactivate AudioContext, MIDI and Sensors on user interaction
-    window.addEventListener('visibilitychange', function () {
-        if (window.visibilityState === 'hidden') {
-            deactivateAudioMIDISensors();
-        }
+    // 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 (window.visibilityState === 'hidden') {
+        deactivateAudioMIDISensors();
+    }
+});
+
 
-})();

package/assets/standalone/index-template.js

@@ -1,18 +1,49 @@
 // Set to > 0 if the DSP is polyphonic
 const FAUST_DSP_VOICES = 0;
 
-(async () => {
+// Declare faustNode as a global variable
+let faustNode;
 
-    const { createFaustNode, connectToAudioInput } = await import("./create-node.js");
+// Create audio context activation button
+/** @type {HTMLButtonElement} */
+const $buttonDsp = document.getElementById("button-dsp");
+
+// Create audio context
+const AudioCtx = window.AudioContext || window.webkitAudioContext;
+const audioContext = new AudioCtx({ latencyHint: 0.00001 });
+
+// Activate AudioContext and Sensors on user interaction
+$buttonDsp.disabled = true;
+let sensorHandlersBound = false;
+$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;
+    }
 
-    // Create audio context
-    const AudioCtx = window.AudioContext || window.webkitAudioContext;
-    const audioContext = new AudioCtx({ latencyHint: 0.00001 });
-    audioContext.suspend();
+    // 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();
+        if (FAUST_DSP_VOICES) play(faustNode);
+    }
+}
 
-    // Create audio context activation button
-    /** @type {HTMLButtonElement} */
-    const $buttonDsp = document.getElementById("button-dsp");
+// Called at load time
+(async () => {
+
+    const { createFaustNode, connectToAudioInput } = await import("./create-node.js");
 
     const play = (node) => {
         node.keyOn(0, 60, 100);
@@ -21,21 +52,10 @@ const FAUST_DSP_VOICES = 0;
         setTimeout(() => node.allNotesOff(), 5000);
         setTimeout(() => play(node), 7000);
     }
-    // Function to activate audio context
-    $buttonDsp.disabled = true;
-    $buttonDsp.onclick = async () => {
-        if (audioContext.state === "running") {
-            $buttonDsp.textContent = "Suspended";
-            await audioContext.suspend();
-        } else if (audioContext.state === "suspended") {
-            $buttonDsp.textContent = "Running";
-            await audioContext.resume();
-            if (FAUST_DSP_VOICES) play(faustNode);
-        }
-    }
 
     // Create Faust node
-    const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES);
+    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");
 
     // Connect the Faust node to the audio output
@@ -51,4 +71,5 @@ const FAUST_DSP_VOICES = 0;
 
     // Set page title to the DSP name
     document.title = name;
+
 })();

package/assets/standalone/index.js

@@ -41,6 +41,10 @@ audioContext.suspend();
 
 $buttonDsp.disabled = true;
 
+// Declare faustNode as a global variable
+let faustNode;
+
+// Called at load time
 (async () => {
 
     const { createFaustNode, connectToAudioInput, createFaustUI } = await import("./create-node.js");
@@ -111,7 +115,8 @@ $buttonDsp.disabled = true;
 
     // To test the ScriptProcessorNode mode
     // const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES, true);
-    const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES);
+    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
@@ -128,22 +133,34 @@ $buttonDsp.disabled = true;
     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;
-    $buttonDsp.onclick = async () => {
-        // Activate sensor listeners
-        if (!sensorHandlersBound) {
-            await faustNode.startSensors();
-            sensorHandlersBound = true;
-        }
-        if (audioContext.state === "running") {
-            $buttonDsp.textContent = "Suspended";
-            await audioContext.suspend();
-        } else if (audioContext.state === "suspended") {
-            $buttonDsp.textContent = "Running";
-            await audioContext.resume();
-        }
-    }
 })();
+
+// 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/dist/cjs/index.d.ts

@@ -835,11 +835,11 @@ export declare class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
 	getUI(): FaustUIDescriptor;
 	getDescriptors(): FaustUIInputItem[];
 	hasSoundfiles(): boolean;
+	startSensors(): void;
+	stopSensors(): void;
 	start(): void;
 	stop(): void;
 	destroy(): void;
-	startSensors(): void;
-	stopSensors(): void;
 }
 export declare class FaustMonoWebAudioDsp extends FaustBaseWebAudioDsp implements IFaustMonoWebAudioDsp {
 	private fInstance;

package/dist/cjs/index.js

@@ -2482,6 +2482,12 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     hasSoundfiles() {
       return this.fSoundfiles.length > 0;
     }
+    startSensors() {
+      this.startSensors();
+    }
+    stopSensors() {
+      this.stopSensors();
+    }
     start() {
       this.fProcessing = true;
     }
@@ -2494,12 +2500,6 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       this.fComputeHandler = null;
       this.fPlotHandler = null;
     }
-    startSensors() {
-      this.startSensors();
-    }
-    stopSensors() {
-      this.stopSensors();
-    }
   };
   var FaustMonoWebAudioDsp = class extends FaustBaseWebAudioDsp {
     constructor(instance, sampleRate, sampleSize, bufferSize, soundfiles) {
@@ -3948,42 +3948,14 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     async startSensors() {
       if (this.hasAccInput) {
         if (window.DeviceMotionEvent) {
-          if (typeof window.DeviceMotionEvent.requestPermission === "function") {
-            try {
-              const response = await window.DeviceMotionEvent.requestPermission();
-              if (response === "granted") {
-                window.addEventListener("devicemotion", this.handleDeviceMotion, true);
-              } else if (response === "denied") {
-                alert("You have denied access to motion and orientation data. To enable it, go to Settings > Safari > Motion & Orientation Access.");
-                throw new Error("Unable to access the accelerometer.");
-              }
-            } catch (error) {
-              console.error(error);
-            }
-          } else {
-            window.addEventListener("devicemotion", this.handleDeviceMotion, true);
-          }
+          window.addEventListener("devicemotion", this.handleDeviceMotion, true);
         } else {
           console.log("Cannot set the accelerometer handler.");
         }
       }
       if (this.hasGyrInput) {
         if (window.DeviceMotionEvent) {
-          if (typeof window.DeviceOrientationEvent.requestPermission === "function") {
-            try {
-              const response = await window.DeviceOrientationEvent.requestPermission();
-              if (response === "granted") {
-                window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
-              } else if (response === "denied") {
-                alert("You have denied access to motion and orientation data. To enable it, go to Settings > Safari > Motion & Orientation Access.");
-                throw new Error("Unable to access the gyroscope.");
-              }
-            } catch (error) {
-              console.error(error);
-            }
-          } else {
-            window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
-          }
+          window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
         } else {
           console.log("Cannot set the gyroscope handler.");
         }