@grame/faustwasm 0.6.4 → 0.7.3

package/package.json

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

package/src/FaustAudioWorkletNode.ts

@@ -72,26 +72,36 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
 
     // Public API
 
+    // Accelerometer and gyroscope handlers
+    private handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
+        const isAndroid: boolean = /Android/i.test(navigator.userAgent);
+        if (!accelerationIncludingGravity) return;
+        const { x, y, z } = accelerationIncludingGravity;
+        this.propagateAcc({ x, y, z }, isAndroid);
+    };
+
+    private handleDeviceOrientation = ({ alpha, beta, gamma }: DeviceOrientationEvent) => {
+        this.propagateGyr({ alpha, beta, gamma });
+    };
+
     /** Setup accelerometer and gyroscope handlers */
-    async listenSensors() {
+    async startSensors() {
         if (this.hasAccInput) {
-            const isAndroid: boolean = /Android/i.test(navigator.userAgent);
-            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 {
                         const response = await (window.DeviceMotionEvent as any).requestPermission();
-                        if (response !== "granted") throw new Error("Unable to access the accelerometer.");
-                        window.addEventListener("devicemotion", handleDeviceMotion, true);
+                        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", handleDeviceMotion, true);
+                    window.addEventListener("devicemotion", this.handleDeviceMotion, true);
                 }
             } else {
                 // Browser doesn't support DeviceMotionEvent
@@ -99,20 +109,21 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
             }
         }
         if (this.hasGyrInput) {
-            const handleDeviceOrientation = ({ alpha, beta, gamma }: DeviceOrientationEvent) => {
-                this.propagateGyr({ alpha, beta, gamma });
-            };
             if (window.DeviceMotionEvent) {
                 if (typeof (window.DeviceOrientationEvent as any).requestPermission === "function") { // for iOS 13+
                     try {
                         const response = await (window.DeviceOrientationEvent as any).requestPermission();
-                        if (response !== "granted") throw new Error("Unable to access the gyroscope.");
-                        window.addEventListener("deviceorientation", handleDeviceOrientation, true);
+                        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", handleDeviceOrientation, true);
+                    window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
                 }
             } else {
                 // Browser doesn't support DeviceMotionEvent
@@ -121,6 +132,14 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
         }
     }
 
+    stopSensors() {
+        if (this.hasAccInput) {
+            window.removeEventListener("devicemotion", this.handleDeviceMotion, true);
+        }
+        if (this.hasGyrInput) {
+            window.removeEventListener("deviceorientation", this.handleDeviceOrientation, true);
+        }
+    }
     setOutputParamHandler(handler: OutputParamHandler | null) {
         this.fOutputHandler = handler;
     }

package/src/FaustScriptProcessorNode.ts

@@ -9,6 +9,8 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
     // Needed for ScriptProcessorNode
     protected fInputs!: Float32Array[];
     protected fOutputs!: Float32Array[];
+    protected handleDeviceMotion = undefined as any;
+    protected handleDeviceOrientation = undefined as any;
 
     init(instance: Poly extends true ? FaustPolyWebAudioDsp : FaustMonoWebAudioDsp) {
         this.fDSPCode = instance;
@@ -16,6 +18,18 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
         this.fInputs = new Array(this.fDSPCode.getNumInputs());
         this.fOutputs = new Array(this.fDSPCode.getNumOutputs());
 
+        // Accelerometer and gyroscope handlers
+        this.handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
+            const isAndroid: boolean = /Android/i.test(navigator.userAgent);
+            if (!accelerationIncludingGravity) return;
+            const { x, y, z } = accelerationIncludingGravity;
+            this.propagateAcc({ x, y, z }, isAndroid);
+        };
+
+        this.handleDeviceOrientation = ({ alpha, beta, gamma }: DeviceOrientationEvent) => {
+            this.propagateGyr({ alpha, beta, gamma });
+        };
+
         this.onaudioprocess = (e) => {
 
             // Read inputs
@@ -37,25 +51,23 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
     // Public API
 
     /** Setup accelerometer and gyroscope handlers */
-    async listenSensors() {
+    async startSensors() {
         if (this.hasAccInput) {
-            const isAndroid: boolean = /Android/i.test(navigator.userAgent);
-            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 {
                         const response = await (window.DeviceMotionEvent as any).requestPermission();
-                        if (response !== "granted") throw new Error("Unable to access the accelerometer.");
-                        window.addEventListener("devicemotion", handleDeviceMotion, true);
+                        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", handleDeviceMotion, true);
+                    window.addEventListener("devicemotion", this.handleDeviceMotion, true);
                 }
             } else {
                 // Browser doesn't support DeviceMotionEvent
@@ -63,20 +75,21 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
             }
         }
         if (this.hasGyrInput) {
-            const handleDeviceOrientation = ({ alpha, beta, gamma }: DeviceOrientationEvent) => {
-                this.propagateGyr({ alpha, beta, gamma });
-            };
             if (window.DeviceMotionEvent) {
                 if (typeof (window.DeviceOrientationEvent as any).requestPermission === "function") { // for iOS 13+
                     try {
                         const response = await (window.DeviceOrientationEvent as any).requestPermission();
-                        if (response !== "granted") throw new Error("Unable to access the gyroscope.");
-                        window.addEventListener("deviceorientation", handleDeviceOrientation, true);
+                        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", handleDeviceOrientation, true);
+                    window.addEventListener("deviceorientation", this.handleDeviceOrientation, true);
                 }
             } else {
                 // Browser doesn't support DeviceMotionEvent
@@ -85,6 +98,15 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
         }
     }
 
+    stopSensors() {
+        if (this.hasAccInput) {
+            window.removeEventListener("devicemotion", this.handleDeviceMotion, true);
+        }
+        if (this.hasGyrInput) {
+            window.removeEventListener("deviceorientation", this.handleDeviceOrientation, true);
+        }
+    }
+
     compute(input: Float32Array[], output: Float32Array[]) { return this.fDSPCode.compute(input, output); }
 
     setOutputParamHandler(handler: OutputParamHandler) { this.fDSPCode.setOutputParamHandler(handler); }

package/src/FaustWebAudioDsp.ts

@@ -497,12 +497,12 @@ export interface IFaustBaseWebAudioDsp {
     getJSON(): string;
 
     /**
-     * Start the DSP.
+     * Start the DSP audio processing. 
      */
     start(): void;
 
     /**
-     * Stop the DSP.
+     * Stop the DSP audio processing.
      */
     stop(): void;
 
@@ -764,7 +764,6 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
         }
     }
 
-
     static extractUrlsFromMeta(dspMeta: FaustDspMeta): string[] {
         // Find the entry with the "soundfiles" key
         const soundfilesEntry = dspMeta.meta.find(entry => entry.soundfiles !== undefined);

package/test/faustlive-wasm/faustwasm/index.d.ts

@@ -621,11 +621,11 @@ export interface IFaustBaseWebAudioDsp {
 	 */
 	getJSON(): string;
 	/**
-	 * Start the DSP.
+	 * Start the DSP audio processing.
 	 */
 	start(): void;
 	/**
-	 * Stop the DSP.
+	 * Stop the DSP audio processing.
 	 */
 	stop(): void;
 	/**
@@ -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;
@@ -1352,9 +1355,12 @@ export declare class FaustScriptProcessorNode<Poly extends boolean = false> exte
 	protected fDSPCode: Poly extends true ? FaustPolyWebAudioDsp : FaustMonoWebAudioDsp;
 	protected fInputs: Float32Array[];
 	protected fOutputs: Float32Array[];
+	protected handleDeviceMotion: any;
+	protected handleDeviceOrientation: any;
 	init(instance: Poly extends true ? FaustPolyWebAudioDsp : FaustMonoWebAudioDsp): void;
 	/** 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/test/faustlive-wasm/faustwasm/index.js

@@ -3696,6 +3696,18 @@ var FaustAudioWorkletNode = class extends (globalThis.AudioWorkletNode || null)
     });
     __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;
@@ -3727,56 +3739,59 @@ var FaustAudioWorkletNode = class extends (globalThis.AudioWorkletNode || null)
       }
     };
   }
-  // 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;
   }
@@ -3966,10 +3981,25 @@ var FaustPolyAudioWorkletNode = class extends FaustAudioWorkletNode {
 
 // src/FaustScriptProcessorNode.ts
 var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode || null) {
+  constructor() {
+    super(...arguments);
+    this.handleDeviceMotion = void 0;
+    this.handleDeviceOrientation = void 0;
+  }
   init(instance) {
     this.fDSPCode = instance;
     this.fInputs = new Array(this.fDSPCode.getNumInputs());
     this.fOutputs = new Array(this.fDSPCode.getNumOutputs());
+    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.onaudioprocess = (e) => {
       for (let chan = 0; chan < this.fDSPCode.getNumInputs(); chan++) {
         this.fInputs[chan] = e.inputBuffer.getChannelData(chan);
@@ -3983,54 +4013,58 @@ var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode ||
   }
   // 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);
+    }
+  }
   compute(input, output) {
     return this.fDSPCode.compute(input, output);
   }