@grame/faustwasm 0.6.3 → 0.7.0

package/assets/standalone/index-pwa.js

@@ -31,9 +31,9 @@ audioContext.suspend();
 
 (async () => {
 
+    const { createFaustNode } = await import("./create-node.js");
     // To test the ScriptProcessorNode mode
     // const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "osc", FAUST_DSP_VOICES, true);
-    const { createFaustNode } = await import("./create-node.js");
     const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "osc", FAUST_DSP_VOICES);
     if (!faustNode) throw new Error("Faust DSP not compiled");
 
@@ -50,8 +50,8 @@ audioContext.suspend();
         await connectToAudioInput(audioContext, null, faustNode, null);
     }
 
-    // Function to initialize MIDI
-    function initMIDI() {
+    // Function to start MIDI
+    function startMIDI() {
         // Check if the browser supports the Web MIDI API
         if (navigator.requestMIDIAccess) {
             navigator.requestMIDIAccess().then(
@@ -69,25 +69,81 @@ audioContext.suspend();
         }
     }
 
+    // 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 resume AudioContext, activate MIDI and Sensors on user interaction
-    function activateAudioMIDISensors() {
+    async function activateAudioMIDISensors() {
 
         // Resume the AudioContext
         if (audioContext.state === 'suspended') {
-            audioContext.resume();
+            await audioContext.resume();
         }
 
         // Activate sensor listeners
-        faustNode.listenSensors();
+        if (!sensorHandlersBound) {
+            await faustNode.startSensors();
+            sensorHandlersBound = true;
+        }
 
         // Initialize the MIDI setup
-        if (FAUST_DSP_VOICES > 0) {
-            initMIDI();
+        if (!midiHandlersBound && FAUST_DSP_VOICES > 0) {
+            startMIDI();
+            midiHandlersBound = true;
+        }
+    }
+
+    // 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;
         }
     }
 
     // Add event listeners for user interactions
+
+    // Activate AudioContext, MIDI and Sensors on user interaction
     window.addEventListener('click', activateAudioMIDISensors);
     window.addEventListener('touchstart', activateAudioMIDISensors);
 
+    // Deactivate AudioContext, MIDI and Sensors on user interaction
+    window.addEventListener('visibilitychange', function () {
+        if (window.visibilityState === 'hidden') {
+            deactivateAudioMIDISensors();
+        }
+    });
+
 })();

package/assets/standalone/index-template.js

@@ -22,13 +22,13 @@ const FAUST_DSP_VOICES = 0;
     }
     // Function to activate audio context
     $buttonDsp.disabled = true;
-    $buttonDsp.onclick = () => {
+    $buttonDsp.onclick = async () => {
         if (audioContext.state === "running") {
             $buttonDsp.textContent = "Suspended";
-            audioContext.suspend();
+            await audioContext.suspend();
         } else if (audioContext.state === "suspended") {
             $buttonDsp.textContent = "Running";
-            audioContext.resume();
+            await audioContext.resume();
             if (FAUST_DSP_VOICES) play(faustNode);
         }
     }

package/assets/standalone/index.js

@@ -109,9 +109,9 @@ const buildMidiDeviceMenu = async (faustNode) => {
 
 (async () => {
 
+    const { createFaustNode } = await import("./create-node.js");
     // To test the ScriptProcessorNode mode
     // const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES, true);
-    const { createFaustNode } = await import("./create-node.js");
     const { faustNode, dspMeta: { name } } = await createFaustNode(audioContext, "FAUST_DSP_NAME", FAUST_DSP_VOICES);
     if (!faustNode) throw new Error("Faust DSP not compiled");
 
@@ -133,19 +133,19 @@ const buildMidiDeviceMenu = async (faustNode) => {
     // Set the title and enable the DSP button
     $buttonDsp.disabled = false;
     document.title = name;
-    let motionHandlersBound = false;
+    let sensorHandlersBound = false;
     $buttonDsp.onclick = async () => {
         // Activate sensor listeners
-        if (!motionHandlersBound) {
-            await faustNode.listenSensors();
-            motionHandlersBound = true;
+        if (!sensorHandlersBound) {
+            await faustNode.startSensors();
+            sensorHandlersBound = true;
         }
         if (audioContext.state === "running") {
             $buttonDsp.textContent = "Suspended";
-            audioContext.suspend();
+            await audioContext.suspend();
         } else if (audioContext.state === "suspended") {
             $buttonDsp.textContent = "Running";
-            audioContext.resume();
+            await audioContext.resume();
         }
     }
 })();

package/dist/cjs/index.d.ts

@@ -1289,8 +1289,11 @@ export declare class FaustAudioWorkletNode<Poly extends boolean = false> extends
 	protected fUICallback: UIHandler;
 	protected fDescriptor: FaustUIInputItem[];
 	constructor(context: BaseAudioContext, name: string, factory: LooseFaustDspFactory, options?: Partial<FaustAudioWorkletNodeOptions<Poly>>);
+	private handleDeviceMotion;
+	private handleDeviceOrientation;
 	/** Setup accelerometer and gyroscope handlers */
-	listenSensors(): Promise<void>;
+	startSensors(): Promise<void>;
+	stopSensors(): void;
 	setOutputParamHandler(handler: OutputParamHandler | null): void;
 	getOutputParamHandler(): OutputParamHandler | null;
 	setComputeHandler(handler: ComputeHandler | null): void;
@@ -1353,8 +1356,11 @@ export declare class FaustScriptProcessorNode<Poly extends boolean = false> exte
 	protected fInputs: Float32Array[];
 	protected fOutputs: Float32Array[];
 	init(instance: Poly extends true ? FaustPolyWebAudioDsp : FaustMonoWebAudioDsp): void;
+	private handleDeviceMotion;
+	private handleDeviceOrientation;
 	/** Setup accelerometer and gyroscope handlers */
-	listenSensors(): Promise<void>;
+	startSensors(): Promise<void>;
+	stopSensors(): void;
 	compute(input: Float32Array[], output: Float32Array[]): boolean;
 	setOutputParamHandler(handler: OutputParamHandler): void;
 	getOutputParamHandler(): OutputParamHandler | null;

package/dist/cjs/index.js

@@ -813,8 +813,8 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       if (t[0] & 1)
         throw t[1];
       return t[1];
-    }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+    }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
       return this;
     }), g;
     function verb(n) {
@@ -3726,6 +3726,18 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       });
       __privateAdd(this, _hasAccInput, false);
       __privateAdd(this, _hasGyrInput, false);
+      // Public API
+      // Accelerometer and gyroscope handlers
+      this.handleDeviceMotion = ({ accelerationIncludingGravity }) => {
+        const isAndroid = /Android/i.test(navigator.userAgent);
+        if (!accelerationIncludingGravity)
+          return;
+        const { x, y, z } = accelerationIncludingGravity;
+        this.propagateAcc({ x, y, z }, isAndroid);
+      };
+      this.handleDeviceOrientation = ({ alpha, beta, gamma }) => {
+        this.propagateGyr({ alpha, beta, gamma });
+      };
       this.fJSONDsp = JSONObj;
       this.fJSON = factory.json;
       this.fOutputHandler = null;
@@ -3757,56 +3769,59 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
         }
       };
     }
-    // Public API
     /** Setup accelerometer and gyroscope handlers */
-    async listenSensors() {
+    async startSensors() {
       if (this.hasAccInput) {
-        const isAndroid = /Android/i.test(navigator.userAgent);
-        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 {
               const response = await window.DeviceMotionEvent.requestPermission();
-              if (response !== "granted")
+              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.");
-              window.addEventListener("devicemotion", handleDeviceMotion, true);
+              }
             } catch (error) {
               console.error(error);
             }
           } else {
-            window.addEventListener("devicemotion", handleDeviceMotion, true);
+            window.addEventListener("devicemotion", this.handleDeviceMotion, true);
           }
         } else {
           console.log("Cannot set the accelerometer handler.");
         }
       }
       if (this.hasGyrInput) {
-        const handleDeviceOrientation = ({ alpha, beta, gamma }) => {
-          this.propagateGyr({ alpha, beta, gamma });
-        };
         if (window.DeviceMotionEvent) {
           if (typeof window.DeviceOrientationEvent.requestPermission === "function") {
             try {
               const response = await window.DeviceOrientationEvent.requestPermission();
-              if (response !== "granted")
+              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.");
-              window.addEventListener("deviceorientation", handleDeviceOrientation, true);
+              }
             } catch (error) {
               console.error(error);
             }
           } else {
-            window.addEventListener("deviceorientation", handleDeviceOrientation, true);
+            window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
           }
         } else {
           console.log("Cannot set the gyroscope handler.");
         }
       }
     }
+    stopSensors() {
+      if (this.hasAccInput) {
+        window.removeEventListener("devicemotion", this.handleDeviceMotion, true);
+      }
+      if (this.hasGyrInput) {
+        window.removeEventListener("deviceorientation", this.handleDeviceOrientation, true);
+      }
+    }
     setOutputParamHandler(handler) {
       this.fOutputHandler = handler;
     }
@@ -3996,6 +4011,21 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
 
   // src/FaustScriptProcessorNode.ts
   var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode || null) {
+    constructor() {
+      super(...arguments);
+      // Public API
+      // Accelerometer and gyroscope handlers
+      this.handleDeviceMotion = ({ accelerationIncludingGravity }) => {
+        const isAndroid = /Android/i.test(navigator.userAgent);
+        if (!accelerationIncludingGravity)
+          return;
+        const { x, y, z } = accelerationIncludingGravity;
+        this.propagateAcc({ x, y, z }, isAndroid);
+      };
+      this.handleDeviceOrientation = ({ alpha, beta, gamma }) => {
+        this.propagateGyr({ alpha, beta, gamma });
+      };
+    }
     init(instance) {
       this.fDSPCode = instance;
       this.fInputs = new Array(this.fDSPCode.getNumInputs());
@@ -4011,56 +4041,53 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       };
       this.start();
     }
-    // Public API
     /** Setup accelerometer and gyroscope handlers */
-    async listenSensors() {
+    async startSensors() {
       if (this.hasAccInput) {
-        const isAndroid = /Android/i.test(navigator.userAgent);
-        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 {
               const response = await window.DeviceMotionEvent.requestPermission();
               if (response !== "granted")
                 throw new Error("Unable to access the accelerometer.");
-              window.addEventListener("devicemotion", handleDeviceMotion, true);
+              window.addEventListener("devicemotion", this.handleDeviceMotion, true);
             } catch (error) {
               console.error(error);
             }
           } else {
-            window.addEventListener("devicemotion", handleDeviceMotion, true);
+            window.addEventListener("devicemotion", this.handleDeviceMotion, true);
           }
         } else {
           console.log("Cannot set the accelerometer handler.");
         }
       }
       if (this.hasGyrInput) {
-        const handleDeviceOrientation = ({ alpha, beta, gamma }) => {
-          this.propagateGyr({ alpha, beta, gamma });
-        };
         if (window.DeviceMotionEvent) {
           if (typeof window.DeviceOrientationEvent.requestPermission === "function") {
             try {
               const response = await window.DeviceOrientationEvent.requestPermission();
               if (response !== "granted")
                 throw new Error("Unable to access the gyroscope.");
-              window.addEventListener("deviceorientation", handleDeviceOrientation, true);
+              window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
             } catch (error) {
               console.error(error);
             }
           } else {
-            window.addEventListener("deviceorientation", handleDeviceOrientation, true);
+            window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
           }
         } else {
           console.log("Cannot set the gyroscope handler.");
         }
       }
     }
+    stopSensors() {
+      if (this.hasAccInput) {
+        window.removeEventListener("devicemotion", this.handleDeviceMotion, true);
+      }
+      if (this.hasGyrInput) {
+        window.removeEventListener("deviceorientation", this.handleDeviceOrientation, true);
+      }
+    }
     compute(input, output) {
       return this.fDSPCode.compute(input, output);
     }