@grame/faustwasm 0.4.2 → 0.4.4

package/README.md

@@ -62,20 +62,20 @@ will create a set of files: `poly.js`, `poly.wasm`, `poly.json`, `poly.html` (an
 You can create a standalone Progressive Web Application using the same command line:
 
 ```bash
-rm -rf test/out # make sure you are under the faustwasm directory.
-node scripts/faust2wasm.js test/rev.dsp test/out -standalone
+node scripts/faust2wasm.js test/rev.dsp test/rev -standalone
 ```
-will create a set of files: `icon.png`, `service-worker.js`, `manifest.json`, `rev.js`, `rev.wasm`, `rev.json`, `index.html`, and the `faustwasm`, `faust-ui` folders in the `out` folder.
+will create a set of files: `icon.png`, `service-worker.js`, `manifest.json`, `rev.js`, `rev.wasm`, `rev.json`, `index.html`, and the `faustwasm`, `faust-ui` folders in the `rev` folder. 
 
-The folder contains the necessary ressources to deploy the Faust application as a PWA on a server, to be installed and used offline. Note that audio files used by the `soundfile` primitives in the DSP code will have to be mannually added in the folder. 
+The folder contains the necessary ressources to deploy the Faust application as a PWA on a server, to be installed and used offline. Note that audio files used by the `soundfile` primitives in the DSP code will have to be mannually added in the folder. To test, be sure to launch a local web server at the `test` folder level, then go inside `test\rev` folder. 
 
 A standalone polyphonic and MIDI standalone Progressive Web Application can be created with:
 
 ```bash
-rm -rf test/out # make sure you are under the faustwasm directory.
-node scripts/faust2wasm.js test/organ1.dsp test/out -standalone
+node scripts/faust2wasm.js test/organ1.dsp test/organ1 -poly -standalone
 ```
-will create a set of files: `icon.png`, `service-worker.js`, `manifest.json`, `organ1.js`, `organ1.wasm`, `organ1.json`, `organ1_effect.wasm`, `organ1_effect.json`, `index.html`, and the `faustwasm`, `faust-ui` folders in the `out` folder.
+will create a set of files: `icon.png`, `service-worker.js`, `manifest.json`, `organ1.js`, `organ1.wasm`, `organ1.json`, `organ1_effect.wasm`, `organ1_effect.json`, `index.html`, and the `faustwasm`, `faust-ui` folders in the `organ1` folder.
+
+To test, be sure to launch a local web server at the `test` folder level, then go inside `test\organ1` folder. 
 
 #### Generate SVG Diagrams of a Faust DSP
 
@@ -235,6 +235,8 @@ process = ba.pulsen(1, 10000) : pm.djembe(60, 0.3, 0.4, 1);
 
 ### Projects examples
 
+Several examples can be tested by launching a local web server at the faustwasm root level, and going in `test/faustlive-wasm` and `libfaust-in-worklet` folders.
+
 The package is used in the following projects:
 
 - [faust-web-component](https://github.com/grame-cncm/faust-web-component), a package providing two web components for embedding interactive Faust snippets in web pages.

package/assets/standalone/service-worker-poly.js

@@ -1,27 +1,76 @@
 
 const CACHE_NAME = 'FAUST_DSP-static'; // Cache name without versioning
 
+const POLY_EFFECT_RESOURCES = [
+    '/FAUST_DSP/',
+    '/FAUST_DSP/faust-ui/index.js',
+    '/FAUST_DSP/faust-ui/index.css',
+    '/FAUST_DSP/faustwasm/index.js',
+    '/FAUST_DSP/FAUST_DSP.js',
+    '/FAUST_DSP/FAUST_DSP.wasm',
+    '/FAUST_DSP/FAUST_DSP.json',
+    '/FAUST_DSP/mixerModule.wasm',
+    '/FAUST_DSP/FAUST_DSP_effect.wasm',
+    '/FAUST_DSP/FAUST_DSP_effect.json',
+];
+
+const POLY_RESOURCES = [
+    '/FAUST_DSP/',
+    '/FAUST_DSP/faust-ui/index.js',
+    '/FAUST_DSP/faust-ui/index.css',
+    '/FAUST_DSP/faustwasm/index.js',
+    '/FAUST_DSP/FAUST_DSP.js',
+    '/FAUST_DSP/FAUST_DSP.wasm',
+    '/FAUST_DSP/FAUST_DSP.json',
+    '/FAUST_DSP/mixerModule.wasm',
+];
+
+/**
+ * Install the service worker and cache the resources
+ 
+ */
 self.addEventListener('install', event => {
     event.waitUntil(
         caches.open(CACHE_NAME).then(cache => {
             console.log("Service worker installed");
-            return cache.addAll([
-                '/FAUST_DSP/',
-                '/FAUST_DSP/faust-ui/index.js',
-                '/FAUST_DSP/faust-ui/index.css',
-                '/FAUST_DSP/faustwasm/index.js',
-                '/FAUST_DSP/FAUST_DSP.js',
-                '/FAUST_DSP/FAUST_DSP.wasm',
-                '/FAUST_DSP/FAUST_DSP.json',
-                '/FAUST_DSP/mixerModule.wasm',
-            ]).catch(error => {
-                // Catch and log any errors during the caching process
-                console.error('Failed to cache resources during install:', error);
-            });
+            const urlToCheck = '/FAUST_DSP/FAUST_DSP_effect.json';
+            return fetchResourceAndCache(cache, urlToCheck);
         })
     );
 });
 
+/**
+ * Fetch the resources and cache them
+ * 
+ * @param {Cache} cache The cache to store the resources
+ * @param {string} urlToCheck The URL of the resource to fetch
+ * 
+ * @returns {Promise<void>} A promise that resolves when the resource is fetched and cached
+ */
+
+function fetchResourceAndCache(cache, urlToCheck) {
+    return fetch(urlToCheck).then(response => {
+        if (response.ok) {
+            return cacheResources(cache, POLY_EFFECT_RESOURCES);
+        } else {
+            return cacheResources(cache, POLY_RESOURCES);
+        }
+    }).catch(fetchError => {
+        console.error(`Failed to fetch ${urlToCheck}:`, fetchError);
+    });
+}
+/**
+ * 
+ * @param {*} cache The cache to store the resources
+ * @param {*} resources The resources to cache
+ * @returns 
+ */
+function cacheResources(cache, resources) {
+    return cache.addAll(resources).catch(error => {
+        console.error('Failed to cache resources:', error);
+    });
+}
+
 self.addEventListener("activate", event => {
     console.log("Service worker activated");
 });

package/package.json

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

package/test/faustlive-wasm/index.js

@@ -386,21 +386,21 @@ const uploadOn = (e) => {
             alert("WebAssembly is not supported in this browser !");
             reject("WebAssembly is not supported in this browser !");
         }
-    
+
         // CASE 1 : THE DROPPED OBJECT IS A URL TO SOME FAUST CODE
         if (e.dataTransfer.getData('URL') && e.dataTransfer.getData('URL').split(':').shift() != "file") {
             const url = e.dataTransfer.getData('URL');
             let filename = url.toString().split('/').pop();
             filename = filename.toString().split('.').shift();
             const xmlhttp = new XMLHttpRequest();
-    
+
             xmlhttp.onreadystatechange = () => {
                 if (xmlhttp.readyState === 4 && xmlhttp.status === 200) {
                     dsp_code = xmlhttp.responseText;
                     callback(dsp_code);
                 }
             }
-    
+
             try {
                 xmlhttp.open("GET", url, false);
                 // Avoid error "mal formé" on firefox
@@ -410,10 +410,10 @@ const uploadOn = (e) => {
                 alert(err);
                 reject(err);
             }
-    
+
         } else if (e.dataTransfer.getData('URL').split(':').shift() != "file") {
             dsp_code = e.dataTransfer.getData('text');
-    
+
             // CASE 2 : THE DROPPED OBJECT IS SOME FAUST CODE
             if (dsp_code) {
                 callback(dsp_code);
@@ -423,17 +423,17 @@ const uploadOn = (e) => {
                 /** @type {FileList} */
                 const files = e.target.files || e.dataTransfer.files;
                 const file = files[0];
-    
+
                 if (location.host.indexOf("sitepointstatic") >= 0) return;
-    
+
                 const request = new XMLHttpRequest();
                 if (request.upload) {
-    
+
                     const reader = new FileReader();
                     const ext = file.name.toString().split('.').pop();
                     const filename = file.name.toString().split('.').shift();
                     let type;
-    
+
                     if (ext === "dsp") {
                         type = "dsp";
                         reader.readAsText(file);
@@ -441,7 +441,7 @@ const uploadOn = (e) => {
                         type = "json";
                         reader.readAsText(file);
                     }
-    
+
                     reader.onloadend = (e) => {
                         dsp_code = reader.result;
                         callback(dsp_code);
@@ -492,7 +492,7 @@ const activateMonoDSP = (dsp) => {
     }
 
     // Setup UI
-    DSP.listenMotion();
+    DSP.listenSensors();
     faustUI = new FaustUI({ ui: DSP.getUI(), root: faustUIRoot });
     faustUI.paramChangeByUI = (path, value) => DSP.setParamValue(path, value);
     DSP.setOutputParamHandler(output_handler);
@@ -520,7 +520,7 @@ const activatePolyDSP = (dsp) => {
     }
 
     // Setup UI
-    DSP.listenMotion();
+    DSP.listenSensors();
     faustUI = new FaustUI({ ui: DSP.getUI(), root: faustUIRoot });
     faustUI.paramChangeByUI = (path, value) => DSP.setParamValue(path, value);
     DSP.setOutputParamHandler(output_handler);

package/test/libfaust-in-worklet/index.js

@@ -1,13 +1,13 @@
 //@ts-check
 const div = document.getElementById("log");
 const log = (/** @type {string} */str) => div.innerHTML += str.replace("\n", "<br />") + "<br />";
-const options = "-ftz 2";
 
 (async () => {
     const ctx = new AudioContext();
     globalThis.ctx = ctx;
     globalThis.faustModule = await faustwasm.instantiateFaustModule();
     const post = async () => {
+        const options = "-ftz 2";
         const {
             instantiateFaustModule,
             LibFaust,
@@ -28,7 +28,7 @@ const options = "-ftz 2";
         const libFaust = new LibFaust(faustModule);
         const compiler = new FaustCompiler(libFaust);
         console.log(compiler.version());
-        await gen.compile(compiler, 'dsp', code, "-ftz 0");
+        await gen.compile(compiler, 'dsp', code, options);
 
         console.log(await gen.createAudioWorkletProcessor());
         const processor = await gen.createOfflineProcessor(48000, 128);