@grame/faustwasm 0.4.5 → 0.4.8

package/dist/cjs/index.js

@@ -141,6 +141,10 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
         parameterDescriptors.forEach((pd) => {
           this.paramValuesCache[pd.name] = pd.defaultValue || 0;
         });
+        const { moduleId, instanceId } = options.processorOptions;
+        if (!moduleId || !instanceId)
+          return;
+        this.wamInfo = { moduleId, instanceId };
       }
       static get parameterDescriptors() {
         const params = [];
@@ -154,6 +158,23 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
           FaustBaseWebAudioDsp2.parseUI(effectMeta.ui, callback);
         return params;
       }
+      setupWamEventHandler() {
+        var _a;
+        if (!this.wamInfo)
+          return;
+        const { moduleId, instanceId } = this.wamInfo;
+        const { webAudioModules } = globalThis;
+        const ModuleScope = webAudioModules.getModuleScope(moduleId);
+        const paramMgrProcessor = (_a = ModuleScope == null ? void 0 : ModuleScope.paramMgrProcessors) == null ? void 0 : _a[instanceId];
+        if (!paramMgrProcessor)
+          return;
+        if (paramMgrProcessor.handleEvent)
+          return;
+        paramMgrProcessor.handleEvent = (event) => {
+          if (event.type === "wam-midi")
+            this.midiMessage(event.data.bytes);
+        };
+      }
       process(inputs, outputs, parameters) {
         for (const path in parameters) {
           const [paramValue] = parameters[path];
@@ -199,6 +220,10 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
             }
             break;
           }
+          case "setupWamEventHandler": {
+            this.setupWamEventHandler();
+            break;
+          }
           case "start": {
             this.fDSPCode.start();
             break;
@@ -408,6 +433,10 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
         this.sampleSize = sampleSize;
         this.soundfiles = factory.soundfiles;
         this.initFFT();
+        const { moduleId, instanceId } = options.processorOptions;
+        if (!moduleId || !instanceId)
+          return;
+        this.wamInfo = { moduleId, instanceId };
       }
       get fftProcessorBufferSize() {
         return this.fftSize / 2 + 1;
@@ -453,6 +482,23 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
           }
         ];
       }
+      setupWamEventHandler() {
+        var _a;
+        if (!this.wamInfo)
+          return;
+        const { moduleId, instanceId } = this.wamInfo;
+        const { webAudioModules } = globalThis;
+        const ModuleScope = webAudioModules.getModuleScope(moduleId);
+        const paramMgrProcessor = (_a = ModuleScope == null ? void 0 : ModuleScope.paramMgrProcessors) == null ? void 0 : _a[instanceId];
+        if (!paramMgrProcessor)
+          return;
+        if (paramMgrProcessor.handleEvent)
+          return;
+        paramMgrProcessor.handleEvent = (event) => {
+          if (event.type === "wam-midi")
+            this.midiMessage(event.data.bytes);
+        };
+      }
       processFFT() {
         let samplesForFFT = mod(this.$inputWrite - this.$inputRead, this.fftBufferSize) || this.fftBufferSize;
         while (samplesForFFT >= this.fftSize) {
@@ -590,6 +636,10 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
             (_a = this.fDSPCode) == null ? void 0 : _a.setPlotHandler(this.fPlotHandler);
             break;
           }
+          case "setupWamEventHandler": {
+            this.setupWamEventHandler();
+            break;
+          }
           case "start": {
             (_b = this.fDSPCode) == null ? void 0 : _b.start();
             break;
@@ -3649,7 +3699,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
   // src/FaustAudioWorkletNode.ts
   var _hasAccInput, _hasGyrInput;
   var FaustAudioWorkletNode = class extends (globalThis.AudioWorkletNode || null) {
-    constructor(context, name, factory, options, nodeOptions = {}) {
+    constructor(context, name, factory, options = {}) {
       const JSONObj = JSON.parse(factory.json);
       super(context, name, {
         numberOfInputs: JSONObj.inputs > 0 ? 1 : 0,
@@ -3658,8 +3708,8 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
         outputChannelCount: [JSONObj.outputs],
         channelCountMode: "explicit",
         channelInterpretation: "speakers",
-        processorOptions: options,
-        ...nodeOptions
+        processorOptions: options.processorOptions,
+        ...options
       });
       __privateAdd(this, _hasAccInput, false);
       __privateAdd(this, _hasGyrInput, false);
@@ -3699,22 +3749,12 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     async listenSensors() {
       if (this.hasAccInput) {
         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 });
-          };
-        }
+        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 {
@@ -3777,6 +3817,9 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     getPlotHandler() {
       return this.fPlotHandler;
     }
+    setupWamEventHandler() {
+      this.port.postMessage({ type: "setupWamEventHandler" });
+    }
     getNumInputs() {
       return this.fJSONDsp.inputs;
     }
@@ -3870,33 +3913,25 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
   _hasAccInput = new WeakMap();
   _hasGyrInput = new WeakMap();
   var FaustMonoAudioWorkletNode = class extends FaustAudioWorkletNode {
-    constructor(context, name, factory, sampleSize, nodeOptions = {}) {
-      super(context, name, factory, { name, factory, sampleSize }, nodeOptions);
+    constructor(context, options) {
+      super(context, options.processorOptions.name, options.processorOptions.factory, options);
       this.onprocessorerror = (e) => {
         throw e;
       };
     }
   };
   var FaustPolyAudioWorkletNode = class extends FaustAudioWorkletNode {
-    constructor(context, name, voiceFactory, mixerModule, voices, sampleSize, effectFactory, nodeOptions = {}) {
+    constructor(context, options) {
       super(
         context,
-        name,
-        voiceFactory,
-        {
-          name,
-          voiceFactory,
-          mixerModule,
-          voices,
-          sampleSize,
-          effectFactory
-        },
-        nodeOptions
+        options.processorOptions.name,
+        options.processorOptions.voiceFactory,
+        options
       );
       this.onprocessorerror = (e) => {
         throw e;
       };
-      this.fJSONEffect = effectFactory ? JSON.parse(effectFactory.json) : null;
+      this.fJSONEffect = options.processorOptions.effectFactory ? JSON.parse(options.processorOptions.effectFactory.json) : null;
       if (this.fJSONEffect) {
         FaustBaseWebAudioDsp.parseUI(this.fJSONEffect.ui, this.fUICallback);
       }
@@ -3968,22 +4003,12 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
     async listenSensors() {
       if (this.hasAccInput) {
         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 });
-          };
-        }
+        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 {
@@ -4146,7 +4171,7 @@ export default ${(_b = jsCode.match(jsCodeHead)) == null ? void 0 : _b[1]};
       const map = SoundfileReader_default.findSoundfilesFromMeta(meta);
       return Object.keys(map);
     }
-    async createNode(context, name = this.name, factory = this.factory, sp = false, bufferSize = 1024, processorName = (factory == null ? void 0 : factory.shaKey) || name) {
+    async createNode(context, name = this.name, factory = this.factory, sp = false, bufferSize = 1024, processorName = (factory == null ? void 0 : factory.shaKey) || name, processorOptions = {}) {
       var _a, _b;
       if (!factory)
         throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
@@ -4204,11 +4229,11 @@ const dependencies = {
             throw e;
           }
         }
-        const node = new FaustMonoAudioWorkletNode(context, processorName, factory, sampleSize);
+        const node = new FaustMonoAudioWorkletNode(context, { processorOptions: { name: processorName, factory, sampleSize, ...processorOptions } });
         return node;
       }
     }
-    async createFFTNode(context, fftUtils, name = this.name, factory = this.factory, fftOptions = {}, processorName = (factory == null ? void 0 : factory.shaKey) ? `${factory.shaKey}_fft` : name) {
+    async createFFTNode(context, fftUtils, name = this.name, factory = this.factory, fftOptions = {}, processorName = (factory == null ? void 0 : factory.shaKey) ? `${factory.shaKey}_fft` : name, processorOptions = {}) {
       var _a, _b;
       if (!factory)
         throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
@@ -4260,7 +4285,7 @@ const dependencies = {
           throw e;
         }
       }
-      const node = new FaustMonoAudioWorkletNode(context, processorName, factory, sampleSize, { channelCount: Math.max(1, Math.ceil(meta.inputs / 3)), outputChannelCount: [Math.ceil(meta.outputs / 2)] });
+      const node = new FaustMonoAudioWorkletNode(context, { channelCount: Math.max(1, Math.ceil(meta.inputs / 3)), outputChannelCount: [Math.ceil(meta.outputs / 2)], processorOptions: { name: processorName, factory, sampleSize, ...processorOptions } });
       if (fftOptions.fftSize) {
         const param = node.parameters.get("fftSize");
         if (param)
@@ -4422,7 +4447,7 @@ process = adaptorIns(dsp_code.process) : dsp_code.effect : adaptorOuts;
       const effectMap = SoundfileReader_default.findSoundfilesFromMeta(effectMeta);
       return Object.keys({ ...effectMap, ...map });
     }
-    async createNode(context, voices, name = this.name, voiceFactory = this.voiceFactory, mixerModule = this.mixerModule, effectFactory = this.effectFactory, sp = false, bufferSize = 1024, processorName = ((voiceFactory == null ? void 0 : voiceFactory.shaKey) || "") + ((effectFactory == null ? void 0 : effectFactory.shaKey) || "") || `${name}_poly`) {
+    async createNode(context, voices, name = this.name, voiceFactory = this.voiceFactory, mixerModule = this.mixerModule, effectFactory = this.effectFactory, sp = false, bufferSize = 1024, processorName = ((voiceFactory == null ? void 0 : voiceFactory.shaKey) || "") + ((effectFactory == null ? void 0 : effectFactory.shaKey) || "") || `${name}_poly`, processorOptions = {}) {
       var _a, _b;
       if (!voiceFactory)
         throw new Error("Code is not compiled, please define the factory or call `await this.compile()` first.");
@@ -4487,7 +4512,7 @@ const dependencies = {
             throw e;
           }
         }
-        const node = new FaustPolyAudioWorkletNode(context, processorName, voiceFactory, mixerModule, voices, sampleSize, effectFactory || void 0);
+        const node = new FaustPolyAudioWorkletNode(context, { processorOptions: { name: processorName, voiceFactory, mixerModule, voices, sampleSize, effectFactory: effectFactory || void 0, ...processorOptions } });
         return node;
       }
     }