use faustwasm for compilation

Makefile

@@ -1,5 +1,5 @@
 compile :
-	tsc --noImplicitThis --noUnusedLocals -target es6 -outFile js/faustplayground.js js/Main.ts
+	tsc --noImplicitThis --noUnusedLocals --sourcemap -target es6 -outFile js/faustplayground.js js/Main.ts
 
 test :
 	cd .. && python -m http.server 8000

index.html

@@ -38,8 +38,11 @@
 <script src="js/Lib/AudioContextMonkeyPatch.js"></script>
 <script src="js/Lib/qrcode.js"></script>
 <script src="js/Lib/perfectScrollBar/js/perfect-scrollbar.min.js"></script>
+<!--
+<script src="js/Lib/faustwasm/index.js"></script>
 <script src="js/Lib/libfaust-wasm.js"></script>
 <script src="js/Lib/webaudio-wasm-wrapper.js"></script>
+-->
 <script src="js/Lib/FileSaver.min.js"></script>
 <script src="https://apis.google.com/js/client.js?onload=checkAuth"></script>
 <script src="js/faustplayground.js"></script>
@@ -50,10 +53,7 @@
         if (!isWasm) {
             alert("WebAssembly is not supported in this browser, the page will not work !")
         }
-        // 'faust_module' global is defined in webaudio-wasm-wrapper.js file, 'onRuntimeInitialized' will be called when code is ready
-        // (see https://kripken.github.io/emscripten-site/docs/getting_started/FAQ.html)
-
-        faust_module['onRuntimeInitialized'] = init;
+        init();
     </script>
 
 </html>

js/App.ts

@@ -16,7 +16,6 @@ Create Factories and Modules
 /// <reference path="Error.ts"/>
 /// <reference path="Dragging.ts"/>
 /// <reference path="Utilitary.ts"/>
-/// <reference path="Lib/webaudio-asm-worker-wrapper.d.ts"/>
 /// <reference path="Modules/FaustInterface.ts"/>
 /// <reference path="Scenes/SceneView.ts"/>
 /// <reference path="Menu/Export.ts"/>
@@ -90,7 +89,7 @@ class App {
     ****************  CREATE FAUST FACTORIES AND MODULES ****************
     ********************************************************************/
 
-    compileFaust(compileFaust: CompileFaust) {
+    async compileFaust(compileFaust: CompileFaust) {
 
         //  Temporarily Saving parameters of compilation
         this.tempModuleName = compileFaust.name;
@@ -103,12 +102,16 @@ class App {
         if (currentScene) { currentScene.muteScene() };
 
         // Libraries are now included and loaded from the EMCC locale FS inluded in libfaust
-        var libpath = "libraries";
-        var args: string[] = ["-I", libpath, "-ftz", "2"];
+        // var libpath = "libraries";
+        // var args: string[] = ["-I", libpath, "-ftz", "2"];
 
         //try to create the wasm code/factory with the given Faust code. Then callback to function passing the factory.
         try {
-            this.factory = faust.createDSPFactory(compileFaust.sourceCode, args, (factory) => { compileFaust.callback(factory) });
+            const faustMonoDspGenerator = new faustWasmEnv.FaustMonoDspGenerator();
+            await faustMonoDspGenerator.compile(faustWasmEnv.faustCompiler, "FaustDSP", compileFaust.sourceCode, "-ftz 2");
+            if (!faustMonoDspGenerator.factory) throw new Error("Faust DSP is not compiled");
+            this.factory = faustMonoDspGenerator.factory;
+            compileFaust.callback(this.factory);
         } catch (error) {
             new Message(error)
         }
@@ -120,7 +123,7 @@ class App {
     //
     private createModule(factory: Factory): void {
         if (!factory) {
-            new Message(Utilitary.messageRessource.errorFactory + faust.getErrorMessage());
+            new Message(Utilitary.messageRessource.errorFactory /*+ faust.getErrorMessage() */);
             Utilitary.hideFullPageLoading();
             return;
         }
@@ -167,7 +170,7 @@ class App {
     setGeneralAppListener(app: App): void {
 
         //custom event to load file from the load menu with the file explorer
-        document.addEventListener("fileload", (e: CustomEvent) => { this.loadFileEvent(e) })
+        document.addEventListener("fileload", (e: Event) => { this.loadFileEvent(e as CustomEvent<File>) })
 
         //All drog and drop events
         window.ondragover = function () { return false; };
@@ -207,7 +210,7 @@ class App {
         };
 
         //custom double touch from library menu to load an effect or an intrument.
-        document.addEventListener("dbltouchlib", (e: CustomEvent) => { this.dblTouchUpload(e) });
+        document.addEventListener("dbltouchlib", (e: Event) => { this.dblTouchUpload(e as CustomEvent<string>) });
     }
 
     //-- Upload content dropped on the page and allocate the content to the right function
@@ -317,15 +320,15 @@ class App {
         };
     }
     //used when a custom event from loading file with the browser dialogue
-    loadFileEvent(e: CustomEvent) {
+    loadFileEvent(e: CustomEvent<File>) {
         Utilitary.showFullPageLoading();
-        var file: File = <File>e.detail;
+        var file = e.detail;
         var position: PositionModule = Utilitary.currentScene.positionDblTapModule();
         this.loadFile(file, null, position.x, position.y)
 
     }
     //used with the library double touch custom event
-    dblTouchUpload(e: CustomEvent) {
+    dblTouchUpload(e: CustomEvent<string>) {
         Utilitary.showFullPageLoading();
         var position: PositionModule = Utilitary.currentScene.positionDblTapModule();
         this.uploadUrl(this, null, position.x, position.y, e.detail);