@grame/faustwasm 0.3.1 → 0.4.0

package/package.json

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

package/src/FaustAudioWorkletNode.ts

@@ -75,11 +75,21 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
     /** Setup accelerometer and gyroscope handlers */
     async listenSensors() {
         if (this.hasAccInput) {
-            const handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
-                if (!accelerationIncludingGravity) return;
-                const { x, y, z } = accelerationIncludingGravity;
-                this.propagateAcc({ x, y, z });
-            };
+            const isAndroid: boolean = /Android/i.test(navigator.userAgent);
+            let handleDeviceMotion = null;
+            if (isAndroid) {
+                handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
+                    if (!accelerationIncludingGravity) return;
+                    const { x, y, z } = accelerationIncludingGravity;
+                    this.propagateAcc({ x, y, z }, true);
+                }
+            } else {
+                handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
+                    if (!accelerationIncludingGravity) return;
+                    const { x, y, z } = accelerationIncludingGravity;
+                    this.propagateAcc({ x, y, z });
+                }
+            }
             if (window.DeviceMotionEvent) {
                 if (typeof (window.DeviceMotionEvent as any).requestPermission === "function") { // for iOS 13+
                     try {
@@ -185,9 +195,9 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
     }
 
     get hasAccInput() { return this.#hasAccInput; }
-    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>) {
+    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean = false) {
         if (!accelerationIncludingGravity) return;
-        const e = { type: "acc", data: accelerationIncludingGravity };
+        const e = { type: "acc", data: accelerationIncludingGravity, invert: invert };
         this.port.postMessage(e);
     }
 
@@ -230,7 +240,6 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
         this.port.postMessage({ type: "destroy" });
         this.port.close();
     }
-
 }
 
 /**

package/src/FaustAudioWorkletProcessor.ts

@@ -127,7 +127,7 @@ const getFaustAudioWorkletProcessor = <Poly extends boolean = false>(dependencie
             switch (msg.type) {
                 // Sensors messages
                 case "acc": {
-                    this.propagateAcc(msg.data);
+                    this.propagateAcc(msg.data, msg.invert);
                     break;
                 }
                 case "gyr": {
@@ -197,8 +197,8 @@ const getFaustAudioWorkletProcessor = <Poly extends boolean = false>(dependencie
             this.fDSPCode.pitchWheel(channel, wheel);
         }
 
-        protected propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>) {
-            this.fDSPCode.propagateAcc(accelerationIncludingGravity);
+        protected propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean = false) {
+            this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
         }
 
         protected propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">) {

package/src/FaustOfflineProcessor.ts

@@ -8,8 +8,8 @@ export interface IFaustOfflineProcessor extends IFaustBaseWebAudioDsp {
     render(inputs?: Float32Array[], length?: number, onUpdate?: (sample: number) => any): Float32Array[];
 }
 
-export interface IFaustMonoOfflineProcessor extends IFaustOfflineProcessor, IFaustMonoWebAudioDsp {}
-export interface IFaustPolyOfflineProcessor extends IFaustOfflineProcessor, IFaustPolyWebAudioDsp {}
+export interface IFaustMonoOfflineProcessor extends IFaustOfflineProcessor, IFaustMonoWebAudioDsp { }
+export interface IFaustPolyOfflineProcessor extends IFaustOfflineProcessor, IFaustPolyWebAudioDsp { }
 
 export class FaustOfflineProcessor<Poly extends boolean = false> {
     protected fDSPCode!: Poly extends true ? FaustPolyWebAudioDsp : FaustMonoWebAudioDsp;
@@ -82,8 +82,8 @@ export class FaustOfflineProcessor<Poly extends boolean = false> {
     destroy() { this.fDSPCode.destroy(); }
 
     get hasAccInput() { return this.fDSPCode.hasAccInput; }
-    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>) {
-        this.fDSPCode.propagateAcc(accelerationIncludingGravity);
+    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean = false) {
+        this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
     }
 
     get hasGyrInput() { return this.fDSPCode.hasGyrInput; }

package/src/FaustScriptProcessorNode.ts

@@ -39,11 +39,21 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
     /** Setup accelerometer and gyroscope handlers */
     async listenSensors() {
         if (this.hasAccInput) {
-            const handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
-                if (!accelerationIncludingGravity) return;
-                const { x, y, z } = accelerationIncludingGravity;
-                this.propagateAcc({ x, y, z });
-            };
+            const isAndroid: boolean = /Android/i.test(navigator.userAgent);
+            let handleDeviceMotion = null;
+            if (isAndroid) {
+                handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
+                    if (!accelerationIncludingGravity) return;
+                    const { x, y, z } = accelerationIncludingGravity;
+                    this.propagateAcc({ x, y, z }, true);
+                }
+            } else {
+                handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
+                    if (!accelerationIncludingGravity) return;
+                    const { x, y, z } = accelerationIncludingGravity;
+                    this.propagateAcc({ x, y, z });
+                }
+            }
             if (window.DeviceMotionEvent) {
                 if (typeof (window.DeviceMotionEvent as any).requestPermission === "function") { // for iOS 13+
                     try {
@@ -120,8 +130,8 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
     destroy() { this.fDSPCode.destroy(); }
 
     get hasAccInput() { return this.fDSPCode.hasAccInput; }
-    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>) {
-        this.fDSPCode.propagateAcc(accelerationIncludingGravity);
+    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean = false) {
+        this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
     }
 
     get hasGyrInput() { return this.fDSPCode.hasGyrInput; }

package/src/FaustWebAudioDsp.ts

@@ -514,7 +514,7 @@ export interface IFaustBaseWebAudioDsp {
     /** Indicating if the DSP handles the accelerometer */
     readonly hasAccInput: boolean;
     /** Accelerometer handling */
-    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>): void;
+    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean): void;
 
     /** Indicating if the DSP handles the gyroscope */
     readonly hasGyrInput: boolean;
@@ -687,15 +687,22 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
     }
 
     get hasAccInput() { return this.fAcc.x.length + this.fAcc.y.length + this.fAcc.z.length > 0; }
-    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>) {
+    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean = false) {
 
         // Get accelerometervalues
         const { x, y, z } = accelerationIncludingGravity;
 
-        // Call the accelerometer handlers
-        if (x !== null) this.fAcc.x.forEach(handler => handler(x));
-        if (y !== null) this.fAcc.y.forEach(handler => handler(y));
-        if (z !== null) this.fAcc.z.forEach(handler => handler(z));
+        if (invert) {
+            // Call the accelerometer handlers
+            if (x !== null) this.fAcc.x.forEach(handler => handler(-x));
+            if (y !== null) this.fAcc.y.forEach(handler => handler(-y));
+            if (z !== null) this.fAcc.z.forEach(handler => handler(-z));
+        } else {
+            // Call the accelerometer handlers
+            if (x !== null) this.fAcc.x.forEach(handler => handler(x));
+            if (y !== null) this.fAcc.y.forEach(handler => handler(y));
+            if (z !== null) this.fAcc.z.forEach(handler => handler(z));
+        }
     }
 
     get hasGyrInput() { return this.fGyr.x.length + this.fGyr.y.length + this.fGyr.z.length > 0; }

package/src/SoundfileReader.ts

@@ -3,7 +3,18 @@ import type { AudioData, FaustDspMeta, FaustUIItem, LooseFaustDspFactory } from
 
 /** Read metadata and fetch soundfiles */
 class SoundfileReader {
-    static get fallbackPaths() { return [location.href, location.origin]; }
+
+    // Set the fallback paths
+    static get fallbackPaths() { return [location.href, this.getParentUrl(location.href), location.origin]; }
+
+    /**
+     * Extract the parent URL from an URL.
+     * @param url : the URL
+     * @returns : the parent URL
+     */
+    private static getParentUrl(url: string) {
+        return url.substring(0, url.lastIndexOf('/') + 1);
+    }
 
     /**
      * Convert an audio buffer to audio data.
@@ -46,7 +57,10 @@ class SoundfileReader {
     private static async checkFileExists(url: string): Promise<boolean> {
         try {
             console.log(`"checkFileExists" url: ${url}`);
-            const response = await fetch(url, { method: "HEAD" });
+            // Fetch in "HEAD" mode does not properly work with the service-worker.js cache, so use "GET" mode for now
+            //const response = await fetch(url, { method: "HEAD" });
+            const response = await fetch(url);
+            console.log(`"checkFileExists" response.ok: ${response.ok}`);
             return response.ok; // Will be true if the status code is 200-299
         } catch (error) {
             console.error('Fetch error:', error);

package/src/copyWebStandaloneAssets.js

@@ -22,13 +22,23 @@ const copyWebStandaloneAssets = (outputDir, dspName, poly = false) => {
     cpSyncModify(templateJSPath, outputDir + `/${dspName}.js`, "FAUST_DSP", dspName);
 
     const templateHTMLPath = path.join(__dirname, "../assets/standalone/index.html");
-    cpSyncModify(templateHTMLPath, outputDir + `/${dspName}.html`, "FAUST_DSP", dspName);
+    //cpSyncModify(templateHTMLPath, outputDir + `/${dspName}.html`, "FAUST_DSP", dspName);
+    cpSyncModify(templateHTMLPath, outputDir + `/index.html`, "FAUST_DSP", dspName);
+
+    const templateServerJSPath = path.join(__dirname, "../assets/standalone/service-worker.js");
+    cpSyncModify(templateServerJSPath, outputDir + `/service-worker.js`, "FAUST_DSP", dspName);
+
+    const templateIconPath = path.join(__dirname, "../assets/standalone/icon.png");
+    cpSync(templateIconPath, outputDir + `/icon.png`);
 
     const faustwasmPath = path.join(__dirname, "../assets/standalone/faustwasm");
     cpSync(faustwasmPath, outputDir + "/faustwasm");
 
     const faustuiPath = path.join(__dirname, "../assets/standalone/faust-ui");
     cpSync(faustuiPath, outputDir + "/faust-ui");
+
+    const templateManifestPath = path.join(__dirname, "../assets/standalone/manifest.json");
+    cpSyncModify(templateManifestPath, outputDir + `/manifest.json`, "FAUST_DSP", dspName);
 };
 
 /**

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

@@ -635,7 +635,7 @@ export interface IFaustBaseWebAudioDsp {
 	/** Indicating if the DSP handles the accelerometer */
 	readonly hasAccInput: boolean;
 	/** Accelerometer handling */
-	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>): void;
+	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean): void;
 	/** Indicating if the DSP handles the gyroscope */
 	readonly hasGyrInput: boolean;
 	/** Gyroscope handling */
@@ -724,7 +724,7 @@ export declare class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
 	/** Split the soundfile names and return an array of names */
 	static splitSoundfileNames(input: string): string[];
 	get hasAccInput(): boolean;
-	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>): void;
+	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert?: boolean): void;
 	get hasGyrInput(): boolean;
 	propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">): void;
 	/** Build the accelerometer handler */
@@ -1123,7 +1123,7 @@ export declare class FaustOfflineProcessor<Poly extends boolean = false> {
 	stop(): void;
 	destroy(): void;
 	get hasAccInput(): boolean;
-	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>): void;
+	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert?: boolean): void;
 	get hasGyrInput(): boolean;
 	propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">): void;
 	/**
@@ -1211,6 +1211,12 @@ export declare class WavDecoder {
 /** Read metadata and fetch soundfiles */
 export declare class SoundfileReader {
 	static get fallbackPaths(): string[];
+	/**
+	 * Extract the parent URL from an URL.
+	 * @param url : the URL
+	 * @returns : the parent URL
+	 */
+	private static getParentUrl;
 	/**
 	 * Convert an audio buffer to audio data.
 	 *
@@ -1293,7 +1299,7 @@ export declare class FaustAudioWorkletNode<Poly extends boolean = false> extends
 	ctrlChange(channel: number, ctrl: number, value: number): void;
 	pitchWheel(channel: number, wheel: number): void;
 	get hasAccInput(): boolean;
-	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>): void;
+	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert?: boolean): void;
 	get hasGyrInput(): boolean;
 	propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">): void;
 	setParamValue(path: string, value: number): void;
@@ -1366,7 +1372,7 @@ export declare class FaustScriptProcessorNode<Poly extends boolean = false> exte
 	stop(): void;
 	destroy(): void;
 	get hasAccInput(): boolean;
-	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>): void;
+	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert?: boolean): void;
 	get hasGyrInput(): boolean;
 	propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">): void;
 }

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

@@ -138,7 +138,7 @@ var getFaustAudioWorkletProcessor = (dependencies, faustData, register = true) =
       const msg = e.data;
       switch (msg.type) {
         case "acc": {
-          this.propagateAcc(msg.data);
+          this.propagateAcc(msg.data, msg.invert);
           break;
         }
         case "gyr": {
@@ -199,8 +199,8 @@ var getFaustAudioWorkletProcessor = (dependencies, faustData, register = true) =
     pitchWheel(channel, wheel) {
       this.fDSPCode.pitchWheel(channel, wheel);
     }
-    propagateAcc(accelerationIncludingGravity) {
-      this.fDSPCode.propagateAcc(accelerationIncludingGravity);
+    propagateAcc(accelerationIncludingGravity, invert = false) {
+      this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
     }
     propagateGyr(event) {
       this.fDSPCode.propagateGyr(event);
@@ -2103,14 +2103,23 @@ var FaustBaseWebAudioDsp = class _FaustBaseWebAudioDsp {
   get hasAccInput() {
     return this.fAcc.x.length + this.fAcc.y.length + this.fAcc.z.length > 0;
   }
-  propagateAcc(accelerationIncludingGravity) {
+  propagateAcc(accelerationIncludingGravity, invert = false) {
     const { x, y, z } = accelerationIncludingGravity;
-    if (x !== null)
-      this.fAcc.x.forEach((handler) => handler(x));
-    if (y !== null)
-      this.fAcc.y.forEach((handler) => handler(y));
-    if (z !== null)
-      this.fAcc.z.forEach((handler) => handler(z));
+    if (invert) {
+      if (x !== null)
+        this.fAcc.x.forEach((handler) => handler(-x));
+      if (y !== null)
+        this.fAcc.y.forEach((handler) => handler(-y));
+      if (z !== null)
+        this.fAcc.z.forEach((handler) => handler(-z));
+    } else {
+      if (x !== null)
+        this.fAcc.x.forEach((handler) => handler(x));
+      if (y !== null)
+        this.fAcc.y.forEach((handler) => handler(y));
+      if (z !== null)
+        this.fAcc.z.forEach((handler) => handler(z));
+    }
   }
   get hasGyrInput() {
     return this.fGyr.x.length + this.fGyr.y.length + this.fGyr.z.length > 0;
@@ -2970,8 +2979,8 @@ var FaustOfflineProcessor = class {
   get hasAccInput() {
     return this.fDSPCode.hasAccInput;
   }
-  propagateAcc(accelerationIncludingGravity) {
-    this.fDSPCode.propagateAcc(accelerationIncludingGravity);
+  propagateAcc(accelerationIncludingGravity, invert = false) {
+    this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
   }
   get hasGyrInput() {
     return this.fDSPCode.hasGyrInput;
@@ -3487,8 +3496,17 @@ var WavDecoder_default = WavDecoder;
 
 // src/SoundfileReader.ts
 var SoundfileReader = class {
+  // Set the fallback paths
   static get fallbackPaths() {
-    return [location.href, location.origin];
+    return [location.href, this.getParentUrl(location.href), location.origin];
+  }
+  /**
+   * Extract the parent URL from an URL.
+   * @param url : the URL
+   * @returns : the parent URL
+   */
+  static getParentUrl(url) {
+    return url.substring(0, url.lastIndexOf("/") + 1);
   }
   /**
    * Convert an audio buffer to audio data.
@@ -3529,7 +3547,8 @@ var SoundfileReader = class {
   static async checkFileExists(url) {
     try {
       console.log(`"checkFileExists" url: ${url}`);
-      const response = await fetch(url, { method: "HEAD" });
+      const response = await fetch(url);
+      console.log(`"checkFileExists" response.ok: ${response.ok}`);
       return response.ok;
     } catch (error) {
       console.error("Fetch error:", error);
@@ -3649,12 +3668,23 @@ var FaustAudioWorkletNode = class extends (globalThis.AudioWorkletNode || null)
   /** Setup accelerometer and gyroscope handlers */
   async listenSensors() {
     if (this.hasAccInput) {
-      const handleDeviceMotion = ({ accelerationIncludingGravity }) => {
-        if (!accelerationIncludingGravity)
-          return;
-        const { x, y, z } = accelerationIncludingGravity;
-        this.propagateAcc({ x, y, z });
-      };
+      const isAndroid = /Android/i.test(navigator.userAgent);
+      let handleDeviceMotion = null;
+      if (isAndroid) {
+        handleDeviceMotion = ({ accelerationIncludingGravity }) => {
+          if (!accelerationIncludingGravity)
+            return;
+          const { x, y, z } = accelerationIncludingGravity;
+          this.propagateAcc({ x, y, z }, true);
+        };
+      } else {
+        handleDeviceMotion = ({ accelerationIncludingGravity }) => {
+          if (!accelerationIncludingGravity)
+            return;
+          const { x, y, z } = accelerationIncludingGravity;
+          this.propagateAcc({ x, y, z });
+        };
+      }
       if (window.DeviceMotionEvent) {
         if (typeof window.DeviceMotionEvent.requestPermission === "function") {
           try {
@@ -3755,10 +3785,10 @@ var FaustAudioWorkletNode = class extends (globalThis.AudioWorkletNode || null)
   get hasAccInput() {
     return __privateGet(this, _hasAccInput);
   }
-  propagateAcc(accelerationIncludingGravity) {
+  propagateAcc(accelerationIncludingGravity, invert = false) {
     if (!accelerationIncludingGravity)
       return;
-    const e = { type: "acc", data: accelerationIncludingGravity };
+    const e = { type: "acc", data: accelerationIncludingGravity, invert };
     this.port.postMessage(e);
   }
   get hasGyrInput() {
@@ -3907,12 +3937,23 @@ var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode ||
   /** Setup accelerometer and gyroscope handlers */
   async listenSensors() {
     if (this.hasAccInput) {
-      const handleDeviceMotion = ({ accelerationIncludingGravity }) => {
-        if (!accelerationIncludingGravity)
-          return;
-        const { x, y, z } = accelerationIncludingGravity;
-        this.propagateAcc({ x, y, z });
-      };
+      const isAndroid = /Android/i.test(navigator.userAgent);
+      let handleDeviceMotion = null;
+      if (isAndroid) {
+        handleDeviceMotion = ({ accelerationIncludingGravity }) => {
+          if (!accelerationIncludingGravity)
+            return;
+          const { x, y, z } = accelerationIncludingGravity;
+          this.propagateAcc({ x, y, z }, true);
+        };
+      } else {
+        handleDeviceMotion = ({ accelerationIncludingGravity }) => {
+          if (!accelerationIncludingGravity)
+            return;
+          const { x, y, z } = accelerationIncludingGravity;
+          this.propagateAcc({ x, y, z });
+        };
+      }
       if (window.DeviceMotionEvent) {
         if (typeof window.DeviceMotionEvent.requestPermission === "function") {
           try {
@@ -4023,8 +4064,8 @@ var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode ||
   get hasAccInput() {
     return this.fDSPCode.hasAccInput;
   }
-  propagateAcc(accelerationIncludingGravity) {
-    this.fDSPCode.propagateAcc(accelerationIncludingGravity);
+  propagateAcc(accelerationIncludingGravity, invert = false) {
+    this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
   }
   get hasGyrInput() {
     return this.fDSPCode.hasGyrInput;