@grame/faustwasm 0.7.0 → 0.7.3

package/package.json

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

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
@@ -36,18 +50,6 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
 
     // 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 startSensors() {
         if (this.hasAccInput) {
@@ -55,8 +57,12 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
                 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", this.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);
                     }
@@ -73,8 +79,12 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
                 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", this.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);
                     }

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;
 

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;
 	/**
@@ -1355,9 +1355,9 @@ 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;
-	private handleDeviceMotion;
-	private handleDeviceOrientation;
 	/** Setup accelerometer and gyroscope handlers */
 	startSensors(): Promise<void>;
 	stopSensors(): void;

package/test/faustlive-wasm/faustwasm/index.js

@@ -3983,8 +3983,13 @@ var FaustPolyAudioWorkletNode = class extends FaustAudioWorkletNode {
 var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode || null) {
   constructor() {
     super(...arguments);
-    // Public API
-    // Accelerometer and gyroscope handlers
+    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)
@@ -3995,11 +4000,6 @@ var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode ||
     this.handleDeviceOrientation = ({ alpha, beta, gamma }) => {
       this.propagateGyr({ alpha, beta, gamma });
     };
-  }
-  init(instance) {
-    this.fDSPCode = instance;
-    this.fInputs = new Array(this.fDSPCode.getNumInputs());
-    this.fOutputs = new Array(this.fDSPCode.getNumOutputs());
     this.onaudioprocess = (e) => {
       for (let chan = 0; chan < this.fDSPCode.getNumInputs(); chan++) {
         this.fInputs[chan] = e.inputBuffer.getChannelData(chan);
@@ -4011,6 +4011,7 @@ var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode ||
     };
     this.start();
   }
+  // Public API
   /** Setup accelerometer and gyroscope handlers */
   async startSensors() {
     if (this.hasAccInput) {
@@ -4018,9 +4019,12 @@ var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode ||
         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", this.handleDeviceMotion, true);
+            }
           } catch (error) {
             console.error(error);
           }
@@ -4036,9 +4040,12 @@ var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode ||
         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", this.handleDeviceOrientation, true);
+            }
           } catch (error) {
             console.error(error);
           }